Commit 35096bf2e5035bdcef70eb1184c02ffe2f8a2292
1 parent
2d3c8c2402
Exists in
master
and in
6 other branches
高危诊断配置
Showing 1 changed file with 22 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
35096bf
| ... | ... | @@ -3761,31 +3761,36 @@ |
| 3761 | 3761 | |
| 3762 | 3762 | if (CollectionUtils.isNotEmpty(items)) |
| 3763 | 3763 | { |
| 3764 | - //循环系统类 | |
| 3765 | - if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null) | |
| 3764 | + List<BasicConfigResult> configResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID); | |
| 3765 | + if (CollectionUtils.isNotEmpty(configResults)) | |
| 3766 | 3766 | { |
| 3767 | - Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3"); | |
| 3768 | - if (map1 != null) | |
| 3767 | + for (BasicConfigResult bc : configResults) | |
| 3769 | 3768 | { |
| 3770 | - String checkBox = String.valueOf(map1.get("checkBox")); | |
| 3771 | - List<String> selecteds = (List<String>)map1.get("selected"); | |
| 3772 | - if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) | |
| 3769 | + if (bc.getId() != null && map.get(bc.getId()) != null) | |
| 3773 | 3770 | { |
| 3774 | - for (String key : selecteds) | |
| 3771 | + Map map1 = (Map)map.get(bc.getId()); | |
| 3772 | + if (map1 != null) | |
| 3775 | 3773 | { |
| 3776 | - BasicConfig config = basicConfigService.getOneBasicConfigById(key); | |
| 3777 | - if (config != null && StringUtils.isNotEmpty(config.getName())) | |
| 3774 | + String checkBox = String.valueOf(map1.get("checkBox")); | |
| 3775 | + List<String> selecteds = (List<String>)map1.get("selected"); | |
| 3776 | + if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) | |
| 3778 | 3777 | { |
| 3779 | - Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName()); | |
| 3780 | - if (cid != null) | |
| 3778 | + for (String key : selecteds) | |
| 3781 | 3779 | { |
| 3782 | - for (DiagnoseItemModel item : items) | |
| 3780 | + BasicConfig config = basicConfigService.getOneBasicConfigById(key); | |
| 3781 | + if (config != null && StringUtils.isNotEmpty(config.getName())) | |
| 3783 | 3782 | { |
| 3784 | - if (String.valueOf(cid).equals(item.getValueTwo()) | |
| 3785 | - && | |
| 3786 | - CollectionUtils.isNotEmpty(item.getRiskIds())) | |
| 3783 | + Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName()); | |
| 3784 | + if (cid != null) | |
| 3787 | 3785 | { |
| 3788 | - list.addAll(item.getRiskIds()); | |
| 3786 | + for (DiagnoseItemModel item : items) | |
| 3787 | + { | |
| 3788 | + if (String.valueOf(cid).equals(item.getValueTwo()) && | |
| 3789 | + CollectionUtils.isNotEmpty(item.getRiskIds())) | |
| 3790 | + { | |
| 3791 | + list.addAll(item.getRiskIds()); | |
| 3792 | + } | |
| 3793 | + } | |
| 3789 | 3794 | } |
| 3790 | 3795 | } |
| 3791 | 3796 | } |