diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index d062dd4..578fa9d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -351,13 +351,11 @@ public class PostReviewFacade { Patients patients = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, null, 1, false, null, og.getbStatus() != 1); //未分娩建档 - if (null != patients) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩,不能进行复查"); } //取所有医院的建档数据 优先取本院 ,然后取外院 - Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId, false), 3, true, null, og.getbStatus() != 1); PostReviewListResult postReviewListResult = new PostReviewListResult(); if (null != patientsList) { @@ -365,11 +363,14 @@ public class PostReviewFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇已终止妊娠,不能进行复查"); } - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setPid(patientsList.getPid()); - matDeliverQuery.setYn(YnEnums.YES.getId()); +// MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); +// matDeliverQuery.setPid(patientsList.getPid()); +// matDeliverQuery.setYn(YnEnums.YES.getId()); +// List list = matDeliverService.query(matDeliverQuery); +// if (CollectionUtils.isEmpty(list)) { +// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息,不能进行复查"); +// } - List list = matDeliverService.query(matDeliverQuery); PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setPid(patientsList.getPid()); @@ -377,15 +378,14 @@ public class PostReviewFacade { postReviewQuery.setStart(patientsList.getFmDate()); List postReviewModels = postReviewService.findWithList(postReviewQuery); String dueDate = ""; - if (CollectionUtils.isEmpty(list)) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息,不能进行复查"); - } + // 3-产妇 if (patientsList.getType() == 3){ dueDate = DateUtil.getyyyy_MM_dd(patientsList.getFmDate()); - } else { - dueDate = list.get(0).getDueDate(); } +// else { +// dueDate = list.get(0).getDueDate(); +// } HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getPid(), false); List dataList = new ArrayList<>();