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 10ed9b7..40042a0 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 @@ -653,10 +653,10 @@ public class BabyCheckFacade { List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth()); - List listHighRisk = res.getHighRisk(); + List listHighRisk = res.getHighRisk(); if (CollectionUtils.isNotEmpty(listHighRisk)) { - if (listHighRisk.contains("健康")) { + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { base.setHighRisk("健康"); } else { base.setHighRisk("高危"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index bbcd007..7de21aa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2639,10 +2639,10 @@ public class ViewFacade { List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth()); - List listHighRisk = res.getHighRisk(); + List listHighRisk = res.getHighRisk(); if (CollectionUtils.isNotEmpty(listHighRisk)) { - if (listHighRisk.contains("健康")) { + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { result.setMommyHighRiskReason("健康"); } else { result.setMommyHighRiskReason("高危"); @@ -2788,10 +2788,10 @@ public class ViewFacade { List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), babyModel.getBirth()); - List listHighRisk = res.getHighRisk(); + List listHighRisk = res.getHighRisk(); if (CollectionUtils.isNotEmpty(listHighRisk)) { - if (listHighRisk.contains("健康")) { + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { model.setMommyHighRisk("健康"); } else { model.setMommyHighRisk("高危");