From f2ccd0d6b1d1bed09e12951ce18db12345559bc0 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 24 Aug 2017 15:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    |  8 ++++----
 .../lyms/platform/operate/web/utils/MongoUtil.java | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 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 c61f46e..cfae889 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
@@ -1796,17 +1796,17 @@ public class ViewFacade {
         map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
 
         map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
-        Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
+        StringBuilder restTreatmentOpinion2 = new StringBuilder();
         Map<String, List<String>> treatmentOpinion2 = data.getTreatmentOpinion2();
         if(MapUtils.isNotEmpty(treatmentOpinion2)) {
             Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
             while (iterator.hasNext()) {
                 Map.Entry<String, List<String>> iter = iterator.next();
-                restTreatmentOpinion2.put(iter.getKey(), mongoUtil.findPlatValueList(iter.getValue()));
+                restTreatmentOpinion2.append(mongoUtil.findPlatValue(iter.getKey())).append(": ").append(mongoUtil.findPlatValues(iter.getValue())).append("0");
             }
         }
-        map.put("treatmentOpinion2", restTreatmentOpinion2);
-        map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
+        map.put("treatmentOpinion2", restTreatmentOpinion2.toString());
+        map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
 
         //早孕期病毒检测
 //        private String zyqbdjc;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
index 6d39842..af837fd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
@@ -314,4 +314,26 @@ public class MongoUtil {
         }
         return rest;
     }
+
+    public PlantformConfigModel findPlatFormById(String id) {
+        return mongoTemplate.findById(id, PlantformConfigModel.class);
+    }
+
+    public String findPlatValues(List<String> ids) {
+        if(CollectionUtils.isEmpty(ids)) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        for (String id : ids) {
+            PlantformConfigModel plantformConfig = findPlatFormById(id);
+            if(plantformConfig != null) {
+                sb.append(plantformConfig.getValue());
+            }
+        }
+        return sb.toString();
+    }
+    public String findPlatValue(String id) {
+        PlantformConfigModel plantformConfig = findPlatFormById(id);
+        return plantformConfig.getValue();
+    }
 }
-- 
1.8.3.1