diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 9499d9e..e9d53f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -328,8 +328,7 @@ public class AntenatalExaminationFacade { max = listDate.get(0).getDate(); } - HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel, min, max); - return highScoreResult; + return getPatLastRiskByDate(pid, needLevel, min, max); } /** @@ -557,9 +556,7 @@ public class AntenatalExaminationFacade { patientsQuery1.setBookbuildingDateEnd(end); if (listDate.size() > i + 1) { patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000)); - }/*else if(listDate.size()==i){ - patientsQuery1.setBookbuildingDateStart(new Date()); - }*/ + } pid = list.get(0).getPid(); patientsQuery1.setPid(pid); List patientses = patientsService.queryPatient1(patientsQuery1); @@ -900,27 +897,7 @@ public class AntenatalExaminationFacade { if (null != patients.getFmDate()) { dueDate = DateUtil.getyyyy_MM_dd(patients.getFmDate()); } - /*if (null!=patients.getFmDate()) { - MaternalDeliverModel model = modelList.get(0); - dueDate = model.getDueDate(); - } else { - PatientsQuery query1 = new PatientsQuery(); - query1.setCardNo(exListQueryRequest.getCardNo()); - query1.setYn(YnEnums.YES.getId()); - List pats = patientsService.queryPatient(query1); - if (CollectionUtils.isNotEmpty(pats)) - { - - //终止妊娠 - StopPregQuery query = new StopPregQuery(); - query.setYn(YnEnums.YES.getId()); - query.setPatientId(patients.getId()); - stopPregs = stopPregnancyService.queryStopPreg(query); - if (CollectionUtils.isNotEmpty(stopPregs)) { - dueDate = DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate()); - } - } - }*/ + PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setYn(YnEnums.YES.getId()); @@ -962,7 +939,6 @@ public class AntenatalExaminationFacade { if (list.size() - 1 > i) { postReviewQuery.setStart(date); //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 -// postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/); postReviewQuery.setEnd(list.get(i).getBookbuildingDate()); } } @@ -1114,6 +1090,13 @@ public class AntenatalExaminationFacade { } if (null == patients) { + //查询是否还有其他记录 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null); + + if(null!=patients){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("该孕妇还未在本院建档不能进行产检"); }