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 d04c78c..1699183 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 @@ -3701,24 +3701,27 @@ public class AntenatalExaminationFacade { //浮肿 for (DiagnoseItemModel item : items) { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) - && String.valueOf(DiagnoseEnums.JwsChildEnums.A.getId()).equals(item.getValueTwo()) && - CollectionUtils.isNotEmpty(item.getRiskIds())) { + && String.valueOf(DiagnoseEnums.JwsChildEnums.A.getId()).equals(item.getValueTwo()) + && FuZhongEnums.O.getId().equals(antExcAddRequest.getEdema()) + && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) - && String.valueOf(DiagnoseEnums.JwsChildEnums.B.getId()).equals(item.getValueTwo()) && - CollectionUtils.isNotEmpty(item.getRiskIds())) + && String.valueOf(DiagnoseEnums.JwsChildEnums.B.getId()).equals(item.getValueTwo()) + && FuZhongEnums.O1.getId().equals(antExcAddRequest.getEdema()) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) - && String.valueOf(DiagnoseEnums.JwsChildEnums.C.getId()).equals(item.getValueTwo()) && + && String.valueOf(DiagnoseEnums.JwsChildEnums.C.getId()).equals(item.getValueTwo()) + && FuZhongEnums.O2.getId().equals(antExcAddRequest.getEdema()) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne()) - && String.valueOf(DiagnoseEnums.JwsChildEnums.D.getId()).equals(item.getValueTwo()) && + && String.valueOf(DiagnoseEnums.JwsChildEnums.D.getId()).equals(item.getValueTwo()) + && FuZhongEnums.O3.getId().equals(antExcAddRequest.getEdema()) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds());