Commit 6c6b54529318bc0a6ae64232a63877e473015063
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
6c6b545
| ... | ... | @@ -3768,31 +3768,36 @@ |
| 3768 | 3768 | |
| 3769 | 3769 | if (CollectionUtils.isNotEmpty(items)) |
| 3770 | 3770 | { |
| 3771 | - //循环系统类 | |
| 3772 | - if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null) | |
| 3771 | + List<BasicConfigResult> configResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID); | |
| 3772 | + if (CollectionUtils.isNotEmpty(configResults)) | |
| 3773 | 3773 | { |
| 3774 | - Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3"); | |
| 3775 | - if (map1 != null) | |
| 3774 | + for (BasicConfigResult bc : configResults) | |
| 3776 | 3775 | { |
| 3777 | - String checkBox = String.valueOf(map1.get("checkBox")); | |
| 3778 | - List<String> selecteds = (List<String>)map1.get("selected"); | |
| 3779 | - if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) | |
| 3776 | + if (bc.getId() != null && map.get(bc.getId()) != null) | |
| 3780 | 3777 | { |
| 3781 | - for (String key : selecteds) | |
| 3778 | + Map map1 = (Map)map.get(bc.getId()); | |
| 3779 | + if (map1 != null) | |
| 3782 | 3780 | { |
| 3783 | - BasicConfig config = basicConfigService.getOneBasicConfigById(key); | |
| 3784 | - if (config != null && StringUtils.isNotEmpty(config.getName())) | |
| 3781 | + String checkBox = String.valueOf(map1.get("checkBox")); | |
| 3782 | + List<String> selecteds = (List<String>)map1.get("selected"); | |
| 3783 | + if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds)) | |
| 3785 | 3784 | { |
| 3786 | - Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName()); | |
| 3787 | - if (cid != null) | |
| 3785 | + for (String key : selecteds) | |
| 3788 | 3786 | { |
| 3789 | - for (DiagnoseItemModel item : items) | |
| 3787 | + BasicConfig config = basicConfigService.getOneBasicConfigById(key); | |
| 3788 | + if (config != null && StringUtils.isNotEmpty(config.getName())) | |
| 3790 | 3789 | { |
| 3791 | - if (String.valueOf(cid).equals(item.getValueTwo()) | |
| 3792 | - && | |
| 3793 | - CollectionUtils.isNotEmpty(item.getRiskIds())) | |
| 3790 | + Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName()); | |
| 3791 | + if (cid != null) | |
| 3794 | 3792 | { |
| 3795 | - list.addAll(item.getRiskIds()); | |
| 3793 | + for (DiagnoseItemModel item : items) | |
| 3794 | + { | |
| 3795 | + if (String.valueOf(cid).equals(item.getValueTwo()) && | |
| 3796 | + CollectionUtils.isNotEmpty(item.getRiskIds())) | |
| 3797 | + { | |
| 3798 | + list.addAll(item.getRiskIds()); | |
| 3799 | + } | |
| 3800 | + } | |
| 3796 | 3801 | } |
| 3797 | 3802 | } |
| 3798 | 3803 | } |