Commit 74a3f30a0595946a2c1047b373d7f0f34ed5b47f
1 parent
2eb3e69939
Exists in
master
and in
1 other branch
增加设置parentid
Showing 1 changed file with 6 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
74a3f30
| ... | ... | @@ -770,12 +770,15 @@ |
| 770 | 770 | map.put("id", basicConfig.getId()); |
| 771 | 771 | map.put("name", basicConfig.getName()); |
| 772 | 772 | map.put("code", basicConfig.getCode()); |
| 773 | - basicConfigQuery.setParentId(basicConfig.getId()); | |
| 773 | + basicConfigQuery.setId(basicConfig.getParentId()); | |
| 774 | 774 | List<BasicConfig> basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); |
| 775 | 775 | if (CollectionUtils.isNotEmpty(basicConfigs2)) { |
| 776 | 776 | for (BasicConfig bc:basicConfigs2) { |
| 777 | - | |
| 778 | - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(bc.getName())); | |
| 777 | + String name = bc.getName(); | |
| 778 | + if (name.indexOf("预警") > -1) { | |
| 779 | + name = name.replace("预警", ""); | |
| 780 | + } | |
| 781 | + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 779 | 782 | } |
| 780 | 783 | } |
| 781 | 784 | if (StringUtils.isNotEmpty(basicConfig.getCode())) { |