From 35096bf2e5035bdcef70eb1184c02ffe2f8a2292 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 10 Apr 2018 17:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E8=AF=8A=E6=96=AD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 39 ++++++++++++---------- 1 file changed, 22 insertions(+), 17 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 3227fca..d05327c 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 @@ -3761,31 +3761,36 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(items)) { - //循环系统类 - if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null) + List configResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID); + if (CollectionUtils.isNotEmpty(configResults)) { - Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3"); - if (map1 != null) + for (BasicConfigResult bc : configResults) { - String checkBox = String.valueOf(map1.get("checkBox")); - List selecteds = (List)map1.get("selected"); - if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) + if (bc.getId() != null && map.get(bc.getId()) != null) { - for (String key : selecteds) + Map map1 = (Map)map.get(bc.getId()); + if (map1 != null) { - BasicConfig config = basicConfigService.getOneBasicConfigById(key); - if (config != null && StringUtils.isNotEmpty(config.getName())) + String checkBox = String.valueOf(map1.get("checkBox")); + List selecteds = (List)map1.get("selected"); + if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) { - Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName()); - if (cid != null) + for (String key : selecteds) { - for (DiagnoseItemModel item : items) + BasicConfig config = basicConfigService.getOneBasicConfigById(key); + if (config != null && StringUtils.isNotEmpty(config.getName())) { - if (String.valueOf(cid).equals(item.getValueTwo()) - && - CollectionUtils.isNotEmpty(item.getRiskIds())) + Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName()); + if (cid != null) { - list.addAll(item.getRiskIds()); + for (DiagnoseItemModel item : items) + { + if (String.valueOf(cid).equals(item.getValueTwo()) && + CollectionUtils.isNotEmpty(item.getRiskIds())) + { + list.addAll(item.getRiskIds()); + } + } } } } -- 1.8.3.1