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 80338fa..388601c 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 @@ -231,9 +231,26 @@ public class AntenatalExaminationFacade { * @return */ public HighScoreResult findLastRisk(String pid, boolean needLevel) { + HighScoreResult highScoreResult = getPatLastRiskByDate(pid,needLevel,null); + return highScoreResult; + } + + /** + * 查询当前产程孕妇高危因素 + * @param pid + * @param needLevel + * @param date + * @return + */ + public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel,Date date) + { AntExQuery antExQuery=new AntExQuery(); antExQuery.setPid(pid); antExQuery.setYn(YnEnums.YES.getId()); + if (date != null) + { + antExQuery.setStart(date); + } List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified")); HighScoreResult highScoreResult = new HighScoreResult(); boolean next = true; @@ -291,6 +308,10 @@ public class AntenatalExaminationFacade { //初诊 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setPid(pid); + if (date != null) + { + antExChuQuery.setStart(date); + } antExChuQuery.setYn(YnEnums.YES.getId()); List list1 = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(list1)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 840f8cb..4fa52a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -361,7 +361,7 @@ public class BabyCheckFacade { List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { - HighScoreResult res = antenatalExaminationFacade.findLastRisk(list.get(0).getPid(),false); + HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, model.getBirth()); List listHighRisk = res.getHighRisk(); if (CollectionUtils.isNotEmpty(listHighRisk))