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); } }