jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1ee5fb698a31279e7d1da373bab45443822d1447

Authored by yangfei
1 parent 636425fd95
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

追访已经分娩的孕妇数据流转

Showing 2 changed files with 2 additions and 2 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java View file @ 1ee5fb6
... ... @@ -46,7 +46,7 @@
46 46 TrackDownRecord trackDownRecord1 = getTrackDown(trackDownRecord.getId());
47 47 if (trackDownRecord1 != null) {
48 48 //流程只能往下流转，不能往上回退,，因为9,10,11,12,是后面加入的产筛转出流程所以不做判断
49   - if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType()!=8 && trackDownRecord.getTrackType()!=9 && trackDownRecord.getTrackType()!=10&&trackDownRecord.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) {
  49 + if (trackDownRecord.getTrackType() != null && trackDownRecord1.getTrackType()!=8 && trackDownRecord1.getTrackType()!=9 && trackDownRecord1.getTrackType()!=10&&trackDownRecord1.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) {
50 50 //用以前追访的类型和来源id
51 51 trackDownRecord.setTrackType(trackDownRecord1.getTrackType());
52 52 trackDownRecord.setSource(trackDownRecord1.getSource());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 1ee5fb6
... ... @@ -686,7 +686,7 @@
686 686 TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId());
687 687 if (trackDownRecord1 != null) {
688 688 //流程只能往下流转，不能往上回退,，因为9,10,11,12,是后面加入的产筛转出流程所以不做判断
689   - if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType()!=8 && trackDownRecord.getTrackType()!=9 && trackDownRecord.getTrackType()!=10&&trackDownRecord.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) {
  689 + if (trackDownRecord.getTrackType() != null && trackDownRecord1.getTrackType()!=8 && trackDownRecord1.getTrackType()!=9 && trackDownRecord1.getTrackType()!=10&&trackDownRecord1.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) {
690 690 //用以前追访的类型和来源id
691 691 trackDownRecord.setTrackType(trackDownRecord1.getTrackType());
692 692 trackDownRecord.setSource(trackDownRecord1.getSource());