From cc930b1c3d9244b27491600ecdcf3e53939907e0 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 14:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E8=BF=8720=E5=91=A8=EF=BC=8821?= =?UTF-8?q?=E5=91=A8=E5=8F=8A=E4=BB=A5=E5=90=8E=EF=BC=89=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E7=AD=9B=E5=BA=94=E8=AF=A5=E6=98=AFX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/TrackDownServiceImpl.java | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 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 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); } } -- 1.8.3.1