From 512a5889c0953a761e932b8eec6becade15a9a0f Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Tue, 4 Jun 2019 11:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E9=AB=98=E5=8D=B1=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/BabyCheckModel.java     | 23 +++++++++++++++++++++-
 .../operate/web/facade/BabyCheckFacade.java        |  2 ++
 .../platform/operate/web/facade/ViewFacade.java    |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
index 79b14e4..3f47389 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
@@ -8,6 +8,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -194,9 +195,13 @@ public class BabyCheckModel extends BaseModel {
 
     //是否高危儿童 0 非高危 1高危
     private Integer highRisk;
+    //高危儿因素详情
+    private List<String> highRiskInfo;
+
     //是否是高危儿
     private Integer waskSon;
-
+    //低弱儿详情
+    private List<String> waskSonInfo;
     // 修改时间
     private Date modified;
     //创建时间
@@ -424,6 +429,22 @@ public class BabyCheckModel extends BaseModel {
         this.waskSon = waskSon;
     }
 
+    public List<String> getHighRiskInfo() {
+        return highRiskInfo;
+    }
+
+    public void setHighRiskInfo(List<String> highRiskInfo) {
+        this.highRiskInfo = highRiskInfo;
+    }
+
+    public List<String> getWaskSonInfo() {
+        return waskSonInfo;
+    }
+
+    public void setWaskSonInfo(List<String> waskSonInfo) {
+        this.waskSonInfo = waskSonInfo;
+    }
+
     /***增加眼科检查项***/
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 9123516..f16d2d7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -376,10 +376,12 @@ public class BabyCheckFacade {
             model.setHighRisk(0);
         } else {
             model.setHighRisk(request.getHighRisk());
+            model.setHighRiskInfo(request.getHighRiskInfo());
         }
         if (request.getWeakSon() == null) {
             model.setWaskSon(0);
         } else {
+            model.setWaskSonInfo(request.getWeakSonInfo());
             model.setWaskSon(request.getWeakSon());
         }
 
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 e2d146e..518b8ae 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
@@ -4158,10 +4158,10 @@ public class ViewFacade {
             model.setRemark(babyModel.getMremark());
             //儿保添加高危儿因素
             model.setHighRisk(String.valueOf(babyModel.getHighRisk()));
-            List<Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(babyModel.getHighRiskInfo());
+            List<Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo());
             model.setHighRiskInfo(highRiskInfos);
 
-            List<Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(babyModel.getWeakSonInfo());
+            List<Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getWaskSonInfo());
             model.setWeakSonInfo(weakSonInfos);
             //后续更改
             model.setWeakSon(String.valueOf(babyModel.getWeakSon()));
-- 
1.8.3.1