From fb945686eb3742c53696b20c1103676c88ce6599 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 14:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=A6=82=E5=86=B5=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=92=8C=E4=BA=A7?= =?UTF-8?q?=E5=90=8E=E5=A4=8D=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6360b2d..2d3b1d1 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 @@ -355,21 +355,21 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if ((int) map.get("cqsc") == 3) {//产前筛查 //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) { + if (trackDownRecord.getTrackType()!=9&&trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) { map.put("cqsc", 2); } } if ((int) map.get("fm") == 3) {//分娩 //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() > TrackDownDateEnums.E.getId()) { + if (trackDownRecord.getTrackType() != 8&&trackDownRecord.getTrackType() != 9&&trackDownRecord.getTrackType() > TrackDownDateEnums.E.getId()) { map.put("fm", 2); } } if ((int) map.get("chfc") == 3) {//产后复查 //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) { + if (trackDownRecord.getTrackType() != 8&&trackDownRecord.getTrackType() != 9&&trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) { map.put("chfc", 2); } } -- 1.8.3.1