From 4b5aeb988c3a05e5dfc259f612087239712990e2 Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Thu, 22 Dec 2016 17:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=8E=E9=99=A9=E5=9B=A0?=
 =?UTF-8?q?=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/DischargeAbstractFacade.java   |  6 +++++-
 .../operate/web/result/DischargeAbstractMotherQueryModel.java  | 10 ++++++++++
 .../operate/web/result/DischargeAbstractQueryResult.java       |  6 +++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index 1d840b5..fd66eea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -10,6 +10,7 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest;
 import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest;
 import com.lyms.platform.operate.web.result.*;
+import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.pojo.DischargeAbstractBabyModel;
 import com.lyms.platform.pojo.DischargeAbstractMotherModel;
 import com.lyms.platform.pojo.Patients;
@@ -189,7 +190,8 @@ public class DischargeAbstractFacade {
             for (String riskFactoryId : riskFactorIdList) {
                 RiskFactoryResultModel riskFactoryResultModel = new RiskFactoryResultModel();
                 try {
-                    String name = basicConfigService.getOneBasicConfigById(riskFactoryId).getName();
+                    BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(riskFactoryId);
+                    String name = basicConfig1.getName();
                     boolean flag = true;
                     if (riskFactoryResultModelList.size() > 0) {
                         for (RiskFactoryResultModel factoryResultModel : riskFactoryResultModelList) {
@@ -200,6 +202,8 @@ public class DischargeAbstractFacade {
                     }
                     if (flag) {
                         riskFactoryResultModel.setName(name);
+                        BasicConfig basicConfig2 = basicConfigService.getOneBasicConfigById(basicConfig1.getParentId());
+                        name = basicConfig2.getName();
                         riskFactoryResultModel.setColor("risk_" + RiskDefaultTypeEnum.getColor(name));
                         riskFactoryResultModelList.add(riskFactoryResultModel);
                     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java
index 0349462..dc84500 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java
@@ -35,6 +35,16 @@ public class DischargeAbstractMotherQueryModel {
      */
     private Integer afterMakeBabyDays;
 
+    private String inputMan;
+
+    public String getInputMan() {
+        return inputMan;
+    }
+
+    public void setInputMan(String inputMan) {
+        this.inputMan = inputMan;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java
index 2587a5f..f96aec2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java
@@ -79,7 +79,7 @@ public class DischargeAbstractQueryResult extends BaseResponse {
      * @createTime 2016年12月06日 14时15分
      * @discription 高危评分
      */
-    private String riskScore;
+    private Integer riskScore;
 
     /**
      * @auther HuJiaqi
@@ -165,11 +165,11 @@ public class DischargeAbstractQueryResult extends BaseResponse {
         this.riskFactoryResultModelList = riskFactoryResultModelList;
     }
 
-    public String getRiskScore() {
+    public Integer getRiskScore() {
         return riskScore;
     }
 
-    public void setRiskScore(String riskScore) {
+    public void setRiskScore(Integer riskScore) {
         this.riskScore = riskScore;
     }
 
-- 
1.8.3.1