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 2d3b1d1..4ed4a53 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 @@ -178,9 +178,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS List sb = sieveService.queryListSieveResult(sieveResultQuery); if (CollectionUtils.isNotEmpty(sb)) { temp.put("cqsc", 1);//产前筛查 - } else if (patients.getType() == 3) { - {//已经分娩,就是X - temp.put("cqsc", 2);//产前筛查 + } else { + if (patients.getType() == 3) {//已经分娩,就是X + temp.put("cqsc", 2);//产前筛查){ + }else{//未分娩, + int week = DateUtil.getWeek2(patients.getLastMenses(),new Date()); + if(week>20){//不能做产前筛查追访,产前检查追访 + temp.put("cqsc", 2);//未做产筛 + } } } } @@ -294,9 +299,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS List sb = sieveService.queryListSieveResult(sieveResultQuery); if (CollectionUtils.isNotEmpty(sb)) { temp.put("cqsc", 1);//产前筛查 - } else if (patient.getType() == 3) { - {//已经分娩,就是X - temp.put("cqsc", 2);//产前筛查 + } else { + if (patient.getType() == 3) {//已经分娩,就是X + temp.put("cqsc", 2);//产前筛查){ + }else{//未分娩, + int week = DateUtil.getWeek2(patient.getLastMenses(),new Date()); + if(week>20){//不能做产前筛查追访,产前检查追访 + temp.put("cqsc", 2);//未做产筛 + } } } @@ -355,21 +365,21 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if ((int) map.get("cqsc") == 3) {//产前筛查 //如果当前流程已经结束流程,则显示X - if (trackDownRecord.getTrackType()!=9&&trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) { + if (trackDownRecord.getTrackType() != 8 && trackDownRecord.getTrackType() != 9 && trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) { map.put("cqsc", 2); } } if ((int) map.get("fm") == 3) {//分娩 //如果当前流程已经结束流程,则显示X - if (trackDownRecord.getTrackType() != 8&&trackDownRecord.getTrackType() != 9&&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() != 8&&trackDownRecord.getTrackType() != 9&&trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) { + if (trackDownRecord.getTrackType() != 8 && trackDownRecord.getTrackType() != 9 && trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) { map.put("chfc", 2); } }