From 1ee5fb698a31279e7d1da373bab45443822d1447 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 24 Apr 2018 16:26:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E5=B7=B2=E7=BB=8F=E5=88=86?= =?UTF-8?q?=E5=A8=A9=E7=9A=84=E5=AD=95=E5=A6=87=E6=95=B0=E6=8D=AE=E6=B5=81?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/service/TrackDownRecordService.java | 2 +- .../lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java index 5cdd555..d0d876e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java @@ -46,7 +46,7 @@ public class TrackDownRecordService { TrackDownRecord trackDownRecord1 = getTrackDown(trackDownRecord.getId()); if (trackDownRecord1 != null) { //流程只能往下流转，不能往上回退,，因为9,10,11,12,是后面加入的产筛转出流程所以不做判断 - if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType()!=8 && trackDownRecord.getTrackType()!=9 && trackDownRecord.getTrackType()!=10&&trackDownRecord.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { + if (trackDownRecord.getTrackType() != null && trackDownRecord1.getTrackType()!=8 && trackDownRecord1.getTrackType()!=9 && trackDownRecord1.getTrackType()!=10&&trackDownRecord1.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { //用以前追访的类型和来源id trackDownRecord.setTrackType(trackDownRecord1.getTrackType()); trackDownRecord.setSource(trackDownRecord1.getSource()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 644ae21..520a4f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -686,7 +686,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId()); if (trackDownRecord1 != null) { //流程只能往下流转，不能往上回退,，因为9,10,11,12,是后面加入的产筛转出流程所以不做判断 - if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType()!=8 && trackDownRecord.getTrackType()!=9 && trackDownRecord.getTrackType()!=10&&trackDownRecord.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { + if (trackDownRecord.getTrackType() != null && trackDownRecord1.getTrackType()!=8 && trackDownRecord1.getTrackType()!=9 && trackDownRecord1.getTrackType()!=10&&trackDownRecord1.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { //用以前追访的类型和来源id trackDownRecord.setTrackType(trackDownRecord1.getTrackType()); trackDownRecord.setSource(trackDownRecord1.getSource()); -- 1.8.3.1