From 65ed5bcde428e5f9bd800804d0b83b10bdcd95f5 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 8 Sep 2016 11:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/MaternalDeliverModel.java    |  9 +++++++++
 .../platform/operate/web/request/MatDeliverAddRequest.java   | 11 +++++++++++
 .../platform/operate/web/result/MaternalDeliverResult.java   | 12 +++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
index 5e1102d..62496e2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
@@ -27,6 +27,7 @@ public class MaternalDeliverModel {
     private Integer tireNumber;
     //胎盘
     private String placenta;
+    private String deathCauseText;
     /*//心率
     private double heartRate;
     //胎方位
@@ -134,6 +135,14 @@ public class MaternalDeliverModel {
         this.pid = pid;
     }
 
+    public String getDeathCauseText() {
+        return deathCauseText;
+    }
+
+    public void setDeathCauseText(String deathCauseText) {
+        this.deathCauseText = deathCauseText;
+    }
+
     public static class Baby {
 
         private String id;
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 7766a7c..0a6e0bc 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
@@ -52,6 +52,8 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     private String maternalInfo;
     //死亡原因
     private String deathCause;
+    //死亡原因其他
+    private String deathCauseText;
     //产后血压
     private Map chBp;
     //产后2小时血压
@@ -80,6 +82,14 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     //接生医生
     private String deliverDoctor;
 
+    public String getDeathCauseText() {
+        return deathCauseText;
+    }
+
+    public void setDeathCauseText(String deathCauseText) {
+        this.deathCauseText = deathCauseText;
+    }
+
     public List<MaternalDeliverModel.ExtPlacenta> getExtPlacentas() {
         return extPlacentas;
     }
@@ -157,6 +167,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         maternalDeliverModel.setUmbilicalCordLength(umbilicalCordLength);*/
         maternalDeliverModel.setExtPlacentas(extPlacentas);
         maternalDeliverModel.setFmHospital(fmHospital);
+        maternalDeliverModel.setDeathCauseText(deathCauseText);
         maternalDeliverModel.setDeliverDoctor(deliverDoctor);
         maternalDeliverModel.setId(id);
         return maternalDeliverModel;
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 da76280..e85f849 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
@@ -65,6 +65,8 @@ public class MaternalDeliverResult  {
     private Integer rHloseBloodL;
     //第3产层+产后失血量
     private Integer sHloseBloodL;
+    //死亡原因其他
+    private String deathCauseText;
     //失血原因
     private Map loseBloodCause;
     //产科并发症
@@ -77,10 +79,18 @@ public class MaternalDeliverResult  {
     //接生医生
     private Map<String,String> deliverDoctor;
 
+    public String getDeathCauseText() {
+        return deathCauseText;
+    }
+
+    public void setDeathCauseText(String deathCauseText) {
+        this.deathCauseText = deathCauseText;
+    }
+
     public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
         setId(destModel.getId());
         setParentId(destModel.getParentId());
-
+        setDeathCauseText(destModel.getDeathCauseText());
         setDueDate(destModel.getDueDate());
         setDueWeek(destModel.getDueWeek());
         setTireNumber(destModel.getTireNumber());
-- 
1.8.3.1