From 71f2e06f63ac17bef32fd1fe9afde9d08222ab33 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 24 Jun 2016 17:36:00 +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

---
 .../operate/web/request/MatDeliverAddRequest.java        | 16 ++++++++++++----
 .../operate/web/result/MaternalDeliverResult.java        | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
index 4ec8614..196b947 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
@@ -69,7 +69,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     //第3产层+产后失血量
     private String sHloseBloodL;
     //失血原因
-    private String loseBloodCause;
+    private java.util.Map loseBloodCause;
     //产科并发症
     private java.util.Map ocs;
 
@@ -114,7 +114,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         maternalDeliverModel.settHloseBloodL(tHloseBloodL);
         maternalDeliverModel.setrHloseBloodL(rHloseBloodL);
         maternalDeliverModel.setsHloseBloodL(sHloseBloodL);
-        maternalDeliverModel.setLoseBloodCause(loseBloodCause);
+        maternalDeliverModel.setLoseBloodCause(JsonUtil.obj2JsonString(loseBloodCause));
         maternalDeliverModel.setOcs(JsonUtil.obj2JsonString(ocs));
         /*maternalDeliverModel.setTpmcType(tpmcType);
         maternalDeliverModel.setMcType(mcType);
@@ -178,14 +178,22 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         this.id = id;
     }
 
-    public String getLoseBloodCause() {
+    public Map getLoseBloodCause() {
         return loseBloodCause;
     }
 
-    public void setLoseBloodCause(String loseBloodCause) {
+    public void setLoseBloodCause(Map loseBloodCause) {
         this.loseBloodCause = loseBloodCause;
     }
 
+    public void setSiLielevel(Integer siLielevel) {
+        this.siLielevel = siLielevel;
+    }
+
+    public void setTireNumber(Integer tireNumber) {
+        this.tireNumber = tireNumber;
+    }
+
     public String getMaternalInfo() {
         return maternalInfo;
     }
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 79f8fb2..b221d82 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
@@ -63,7 +63,7 @@ public class MaternalDeliverResult  {
     //第3产层+产后失血量
     private String sHloseBloodL;
     //失血原因
-    private String loseBloodCause;
+    private Map loseBloodCause;
     //产科并发症
     private Map ocs;
     private List<MaternalDeliverModel.ExtPlacenta> extPlacentas;
@@ -101,7 +101,7 @@ public class MaternalDeliverResult  {
         settHloseBloodL(destModel.gettHloseBloodL());
         setrHloseBloodL(destModel.getrHloseBloodL());
         setsHloseBloodL(destModel.getsHloseBloodL());
-        setLoseBloodCause(destModel.getLoseBloodCause());
+        setLoseBloodCause(JsonUtil.str2Obj(destModel.getLoseBloodCause(),Map.class));
         setOcs(JsonUtil.str2Obj(destModel.getOcs(),Map.class));
         setExtPlacentas(destModel.getExtPlacentas());
         setFmHospital(destModel.getFmHospital());
@@ -363,14 +363,22 @@ public class MaternalDeliverResult  {
         this.id = id;
     }
 
-    public String getLoseBloodCause() {
+    public Map getLoseBloodCause() {
         return loseBloodCause;
     }
 
-    public void setLoseBloodCause(String loseBloodCause) {
+    public void setLoseBloodCause(Map loseBloodCause) {
         this.loseBloodCause = loseBloodCause;
     }
 
+    public void setSiLielevel(Integer siLielevel) {
+        this.siLielevel = siLielevel;
+    }
+
+    public void setTireNumber(Integer tireNumber) {
+        this.tireNumber = tireNumber;
+    }
+
     public String getMaternalInfo() {
         return maternalInfo;
     }
-- 
1.8.3.1