From 0c7e75479f90de8b099048961b971d149a8f181d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 10 Apr 2018 21:17:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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()); -- 1.8.3.1