From 5fa7ea6d87fa35313944872f55e5160aa3c0587e Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Wed, 30 Aug 2017 11:41:42 +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

---
 .../operate/web/facade/BabyBookbuildingFacade.java |  4 ++--
 .../operate/web/result/BabyBuildResult.java        | 15 +++-----------
 .../lyms/platform/operate/web/utils/MongoUtil.java | 23 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 3662879..d27e2fc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1219,8 +1219,8 @@ public class BabyBookbuildingFacade {
      */
     private BabyBuildResult getBabyBuildResult(BabyModel model) {
         BabyBuildResult result = new BabyBuildResult();
-        result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
-        result.setmHighRiskReason2(mongoUtil.findNameList(model.getmHighRiskReason()));
+//        result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
+        result.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
 
         result.setId(model.getId());
         result.setPid(model.getPid());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
index fc0d89e..4e39471 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
@@ -8,16 +8,14 @@ import java.util.Map;
  */
 public class BabyBuildResult {
     // 母亲高危因素
-    private List<String> mHighRiskReason;
+    private List<Map<String, Object>> mHighRiskReason;
 
-    private List<Map<String, Object>> mHighRiskReason2;
 
-
-    public List<String> getmHighRiskReason() {
+    public List<Map<String, Object>> getmHighRiskReason() {
         return mHighRiskReason;
     }
 
-    public void setmHighRiskReason(List<String> mHighRiskReason) {
+    public void setmHighRiskReason(List<Map<String, Object>> mHighRiskReason) {
         this.mHighRiskReason = mHighRiskReason;
     }
 
@@ -564,11 +562,4 @@ public class BabyBuildResult {
         this.apgarScore = apgarScore;
     }
 
-    public void setmHighRiskReason2(List<Map<String,Object>> mHighRiskReason2) {
-        this.mHighRiskReason2 = mHighRiskReason2;
-    }
-
-    public List<Map<String, Object>> getmHighRiskReason2() {
-        return mHighRiskReason2;
-    }
 }
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 dbeace5..b944181 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
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.utils;
 
+import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
@@ -372,4 +373,26 @@ public class MongoUtil {
         }
         return list;
     }
+
+    public List<Map<String,Object>> findColor(List<String> ids) {
+       if(CollectionUtils.isNotEmpty(ids)) {
+           List<Map<String, Object>> rest = new ArrayList<>();
+           for (String id : ids) {
+               BasicConfig basicConfig = findBasicConfigById(id);
+               if(basicConfig != null) {
+                   BasicConfig parent = findBasicConfigById(basicConfig.getParentId());
+                   if(parent != null) {
+                       Map<String, Object> tempMap = new HashedMap();
+                       tempMap.put("id", basicConfig.getId());
+                       tempMap.put("name", basicConfig.getName());
+                       tempMap.put("color", RiskDefaultTypeEnum.getColor(parent.getName()));
+                       rest.add(tempMap);
+                   }
+
+               }
+           }
+           return rest;
+       }
+       return null;
+    }
 }
-- 
1.8.3.1