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 4727f56..840f8cb 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 @@ -354,8 +354,15 @@ public class BabyCheckFacade { // } - HighScoreResult res = antenatalExaminationFacade.findLastRisk(model.getPid(),false); - List listHighRisk = res.getHighRisk(); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setCardNo(model.getMcertNo()); + patientsQuery.setYn(YnEnums.YES.getId()); + + List list = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(list)) + { + HighScoreResult res = antenatalExaminationFacade.findLastRisk(list.get(0).getPid(),false); + List listHighRisk = res.getHighRisk(); if (CollectionUtils.isNotEmpty(listHighRisk)) { @@ -372,8 +379,9 @@ public class BabyCheckFacade { { base.setHighRisk("健康"); } - } + } + } base.setMremark(model.getMremark()); base.setMphone(model.getMphone());