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 5e33b90..b6e7dfd 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 @@ -540,20 +540,6 @@ public class ViewFacade { getRisk(data.getRiskFactor(),data.getOtherRisk(),map); -/* HighScoreResult highScoreResult = null; - if (StringUtils.isNotEmpty(data.getRiskFactor())){ - List ids = JsonUtil.toList(data.getRiskFactor(), String.class); - if (CollectionUtils.isNotEmpty(ids)){ - highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService); - } - } - map.put("highRisk",highScoreResult); - - Map otherRisk = new HashMap<>(); - if (StringUtils.isNotEmpty(data.getOtherRisk()) && !"{}".equals(data.getOtherRisk())){ - ResolveUtils.queryOtherRisk(data.getOtherRisk(),otherRisk,basicConfigService); - } - map.put("otherHighRisk",otherRisk);*/ //产检基本信息 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckDate())); map.put("currentDueDate",data.getCurrentDueDate()); 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 8dd32a8..33d34eb 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 @@ -48,6 +48,7 @@ public class ResolveUtils { return ""; } StringBuilder sb = new StringBuilder(); + StringBuilder xsb = new StringBuilder(); try { Set> m = map.entrySet(); Iterator> it = m.iterator(); @@ -55,11 +56,15 @@ public class ResolveUtils { Map.Entry ma = it.next(); if ("true".equals(ma.getValue() + "")) { if (content.containsKey(ma.getKey())) { + if ("qt".equals(ma.getKey())){ + xsb.append(content.get(ma.getKey())).append(','); + continue; + } sb.append(content.get(ma.getKey())).append(','); } } } - String bigSB = sb.toString(); + String bigSB = (sb.append(xsb)).toString(); if (bigSB.contains("其他,")){ if (map.containsKey("qtText")){