From 759d77f9ddae2e17c778eb1337dfdcd62b68945c Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 20 Jan 2017 10:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=88=E6=AD=A2=E5=A6=8A?=
 =?UTF-8?q?=E5=A8=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/ViewFacade.java   | 14 --------------
 .../com/lyms/platform/operate/web/utils/ResolveUtils.java  |  7 ++++++-
 2 files changed, 6 insertions(+), 15 deletions(-)

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<String> ids = JsonUtil.toList(data.getRiskFactor(), String.class);
-            if (CollectionUtils.isNotEmpty(ids)){
-                highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService);
-            }
-        }
-        map.put("highRisk",highScoreResult);
-
-        Map<String,Object> 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<Map.Entry<String, Object>> m = map.entrySet();
             Iterator<Map.Entry<String, Object>> it = m.iterator();
@@ -55,11 +56,15 @@ public class ResolveUtils {
                 Map.Entry<String, Object> 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")){
-- 
1.8.3.1