From 74a3f30a0595946a2c1047b373d7f0f34ed5b47f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 15 Aug 2016 17:36:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 85445a7..80338fa 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 @@ -770,12 +770,15 @@ public class AntenatalExaminationFacade { map.put("id", basicConfig.getId()); map.put("name", basicConfig.getName()); map.put("code", basicConfig.getCode()); - basicConfigQuery.setParentId(basicConfig.getId()); + basicConfigQuery.setId(basicConfig.getParentId()); List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); if (CollectionUtils.isNotEmpty(basicConfigs2)) { for (BasicConfig bc:basicConfigs2) { - - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(bc.getName())); + String name = bc.getName(); + if (name.indexOf("预警") > -1) { + name = name.replace("预警", ""); + } + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } } if (StringUtils.isNotEmpty(basicConfig.getCode())) { -- 1.8.3.1