From 7212f6c623efce878c0bc385037e0e8a6e114d18 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Tue, 5 Sep 2017 17:17:57 +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

---
 .../web/facade/AntenatalExaminationFacade.java     |  2 +-
 .../platform/operate/web/facade/ViewFacade.java    |  5 ++--
 .../lyms/platform/operate/web/utils/MongoUtil.java | 29 +++++++++++++++++++++-
 3 files changed, 31 insertions(+), 5 deletions(-)

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 a8590ac..d2b064d 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
@@ -2202,7 +2202,7 @@ public class AntenatalExaminationFacade {
                     Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
                     while (iterator.hasNext()) {
                         Map.Entry<String, List<String>> map = iterator.next();
-                        restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList2(map.getValue()));
+                        restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList3(map.getValue()));
                     }
                 }
                 antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2);
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 4f03f9a..0de9d3c 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
@@ -1119,10 +1119,9 @@ public class ViewFacade {
 
         Map<String, Object> map = new HashMap<>();
 
-//        map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
-//        map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
-        map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
+        map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
         map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2()));
+//        map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
         map.put("quickenRemark",data.getQuickenRemark());
 
         /*  基本信息  */
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 d4ada24..c926351 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
@@ -336,6 +336,26 @@ public class MongoUtil {
         return rest;
     }
 
+    public List<Map<String, Object>> findPlatValueList3(List<String> ids) {
+        if(CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        List<Map<String, Object>> rest = new ArrayList<>();
+        for (String id : ids) {
+//            PlantformConfigModel platformConfig = getPlatformConfig(id);
+            if(StringUtils.isNotEmpty(id)) {
+                Map<String, Object> tempMap = new HashedMap();
+                String[] values = id.split("\\[fuck\\]");
+                tempMap.put("id", values.length > 1 ? values[1] : "");
+                tempMap.put("typeName", "");
+                tempMap.put("serchKey", values[0]);
+                tempMap.put("value", values[0]);
+                rest.add(tempMap);
+            }
+        }
+        return rest;
+    }
+
     public PlantformConfigModel findPlatFormById(String id) {
         return mongoTemplate.findById(id, PlantformConfigModel.class);
     }
@@ -368,7 +388,14 @@ public class MongoUtil {
         while (iterator.hasNext()) {
             Map.Entry<String, List<String>> next = iterator.next();
             StringBuilder sb = new StringBuilder();
-            sb.append(next.getKey()).append(": ").append(org.apache.commons.lang.StringUtils.join(next.getValue().toArray(), ","));
+            StringBuilder value = new StringBuilder();
+            List<String> valueList = next.getValue();
+            if(CollectionUtils.isNotEmpty(valueList)) {
+                for (String s : valueList) {
+                    value.append(s.split("\\[fuck\\]")[0]);
+                }
+            }
+            sb.append(findPlatValue(next.getKey())).append(": ").append(value.length() == 0 ? "" : sb.toString().substring(0, sb.toString().length() - 1));
             list.add(sb.toString());
         }
         return list;
-- 
1.8.3.1