From 9d33e5ff15e7d64059bfef55bdaf138c4409ee2a Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 6 Sep 2016 09:27:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= 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, 7 insertions(+), 2 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 d27cbbb..e588892 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 @@ -510,7 +510,7 @@ public class AntenatalExaminationFacade { } if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) { List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - highScoreResult = queryRisk(list2, true); + highScoreResult = queryRisk(list2, needLevel); next = false; } if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) { @@ -549,7 +549,12 @@ public class AntenatalExaminationFacade { if (null != basicConfig) { Map map2 = new HashMap<>(); map2.put("id", basicConfig.getId()); - map2.put("name", basicConfig.getName()); + String name = basicConfig.getName(); + map2.put("name", name); + if (name.indexOf("预警") > -1) { + name = name.replace("预警", ""); + } + map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); highScoreResult.getLevel().add(map2); } } -- 1.8.3.1