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); }