From 02b327e59a516899215844c1d76496d62cf23cab Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 24 Jun 2016 15:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/result/MatDeliverListResult.java  | 14 +++++---------
 .../platform/operate/web/result/MaternalDeliverResult.java | 12 ++++++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
index 16d805c..78ced27 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java
@@ -28,7 +28,7 @@ public class MatDeliverListResult  {
     //手机号
     private String phone;
     //高危因素
-    private String riskFactor;
+    private  List riskFactor;
     //高危评分
     private String riskScore;
     //备注
@@ -48,7 +48,6 @@ public class MatDeliverListResult  {
         setPhone(patients.getPhone());
         setRemarks("产妇备注");
         setRiskScore("60");
-        setRiskFactor("高危因素");
         setDueWeek("");
         if(CollectionUtils.isNotEmpty(destList)){
             List<MatDeliverExt>  list = new ArrayList<>();
@@ -60,6 +59,10 @@ public class MatDeliverListResult  {
         return this;
     }
 
+    public void setRiskFactor(List riskFactor) {
+        this.riskFactor = riskFactor;
+    }
+
     public Integer getAge() {
         return age;
     }
@@ -116,13 +119,6 @@ public class MatDeliverListResult  {
         this.remarks = remarks;
     }
 
-    public String getRiskFactor() {
-        return riskFactor;
-    }
-
-    public void setRiskFactor(String riskFactor) {
-        this.riskFactor = riskFactor;
-    }
 
     public String getRiskScore() {
         return riskScore;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
index 16cef49..79f8fb2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
@@ -164,7 +164,7 @@ public class MaternalDeliverResult  {
         //畸形
         private Integer deformity;
         //apgar评分
-        private String apgarScore;
+        private Map apgarScore;
         //窒息分钟
         private String asphyxiaM;
         // 妊娠结局
@@ -184,7 +184,7 @@ public class MaternalDeliverResult  {
             setBabyWeight(babyModel.getBabyWeight());
             setBabyHeight(babyModel.getBabyHeight());
             setDeformity(babyModel.getMalformation());
-            setApgarScore(babyModel.getApgarScore());
+            setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(),Map.class));
             setAsphyxiaM(babyModel.getAsphyxiaM());
             setPregnancyOut(babyModel.getPregnancyOut());
             setBabyHealthy(babyModel.getBabyHealthy());
@@ -201,14 +201,18 @@ public class MaternalDeliverResult  {
             this.id = id;
         }
 
-        public String getApgarScore() {
+        public Map getApgarScore() {
             return apgarScore;
         }
 
-        public void setApgarScore(String apgarScore) {
+        public void setApgarScore(Map apgarScore) {
             this.apgarScore = apgarScore;
         }
 
+        public Integer getDeformity() {
+            return deformity;
+        }
+
         public String getAsphyxiaM() {
             return asphyxiaM;
         }
-- 
1.8.3.1