From 909eea984725630c5fad95bc046c391c66f08a1b Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 23 Jan 2018 16:16:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=88=97=E8=A1=A8=E9=AB=98?= =?UTF-8?q?=E5=8D=B1=E5=9B=A0=E6=95=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/CommonService.java | 21 +++++++++++++-------- .../java/com/lyms/platform/pojo/BasicConfig.java | 2 -- .../web/facade/AntenatalExaminationFacade.java | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java index 9cd38e9..ca545ba 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java @@ -181,20 +181,25 @@ public class CommonService { if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); if (null != basicConfig) { - // String name = basicConfig.getName(); - // if (name.indexOf("预警") > -1) { - // name = name.replace("预警", ""); - // } - // map.put("levelId", idObj1.toString()); - // map.put("level", name); - basicConfig.replenRisk(map); + String name = basicConfig.getName(); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; + } + map.put("levelId", idObj1.toString()); + map.put("level", name); } } //风险评分 Object idObj = map.get("fxpf"); if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); - map.put("score", NumberUtils.toInt(basicConfig.getName(), 0)); + map.put("score", NumberUtils.toInt(basicConfig.getName())); } listMap.add(map); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java index a805ee5..c2d0899 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java @@ -209,8 +209,6 @@ public class BasicConfig extends BaseModel { }else if (name.indexOf("紫色") > -1) { name = "紫色"; } - map.put("levelId", id); - map.put("level", name); map.put("name", name); map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); return map; 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 4c4bee7..3915ca1 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 @@ -786,7 +786,7 @@ public class AntenatalExaminationFacade { if (fxysu != null) { otherRisk.append(fxysu+","); } - score+=NumberUtils.toInt(map.get("score").toString(),0); + score+=NumberUtils.toInt(map.get("score").toString()); highScoreResult.getLevel().add(map); } -- 1.8.3.1