diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index eed3e60..7f44634 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -195,7 +195,6 @@ public class ViewFacade { map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark",patients.getMremark()); - //TODO 高危需要处理,高危因素名称+颜色+高危评分 HighScoreResult highScoreResult = null; if (StringUtils.isNotEmpty(data.getHighrisk())){ List ids = JsonUtil.toList(data.getHighrisk(), String.class); @@ -203,13 +202,39 @@ public class ViewFacade { highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService); } } - map.put("highRisk",highScoreResult); + Integer score = 0; + if (highScoreResult.getScore()!=null){ + score = highScoreResult.getScore(); + } - Map otherRisk = new HashMap<>(); + List> list = ResolveUtils.queryHighRisk(highScoreResult); + + Map otherRisk = null; if (StringUtils.isNotEmpty(data.getOtherHighRisk()) && !"{}".equals(data.getOtherHighRisk())){ + otherRisk = new HashMap<>(); ResolveUtils.queryOtherRisk(data.getOtherHighRisk(),otherRisk,basicConfigService); } - map.put("otherHighRisk",otherRisk); + + Map otherMap = new HashMap<>(); + + if (otherRisk!=null){ + if (otherRisk.get("name")!=null){ + otherMap.put("name",otherRisk.get("name")); + } + if (otherRisk.get("color")!=null){ + otherMap.put("color",otherRisk.get("color")); + } + if (otherRisk.get("score")!=null){ + String s = (String)otherRisk.get("score"); + if (FunvCommonUtil.isNumeric(s)){ + score = score + Integer.parseInt(s); + } + } + list.add(otherMap); + } + + map.put("score",score); + map.put("highRisk",list); //产检基本信息 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckTime())); @@ -503,7 +528,6 @@ public class ViewFacade { map.put("fmWeek",patients.getFmWeek()); map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark",patients.getMremark()); - //TODO 高危需要处理,高危因素名称+颜色+高危评分 HighScoreResult highScoreResult = null; if (StringUtils.isNotEmpty(data.getRiskFactor())){ List ids = JsonUtil.toList(data.getRiskFactor(), String.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java index ab653d7..b4c181e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java @@ -245,6 +245,36 @@ public class ResolveUtils { return map; } + public static List> queryHighRisk(HighScoreResult result){ + + if (result==null){ + return null; + } + + List> mapList = new ArrayList<>(); + + if (CollectionUtils.isNotEmpty(result.getHighRisk())){ + List list = (List)result.getHighRisk(); + if (CollectionUtils.isNotEmpty(list)){ + for (Map m : list){ + + Map map = new HashMap<>(); + + if (m.get("name")!=null){ + map.put("name",m.get("name")); + } + if (m.get("color")!=null){ + map.put("color",m.get("color")); + } + + mapList.add(map); + } + } + } + return mapList; + } + + public static void main(String[] str) {