From f0b5486ae564f8ffcf61922efa9a10a191d4b40b Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 8 May 2018 09:53:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E5=8A=A0=E5=85=A5=E6=89=8B?=
 =?UTF-8?q?=E5=B7=A5=E5=88=86=E5=A8=A9=E5=AD=95=E5=91=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/MaternalDeliverModel.java     | 10 ++++++++++
 .../platform/operate/web/request/MatDeliverAddRequest.java    | 11 +++++++++++
 .../platform/operate/web/result/MatDeliverListResult.java     |  4 ++++
 .../platform/operate/web/result/MaternalDeliverResult.java    | 11 +++++++++++
 4 files changed, 36 insertions(+)

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 28fff67..d8e8e98 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
@@ -24,6 +24,8 @@ public class MaternalDeliverModel extends BaseModel {
     /**新加字段***/
     //产次
     private Integer dueCount;
+    //手工分娩孕周
+    private Map<String,Object> handDueWeek;
     //产妇id
     private String parentId;
     private String pid;
@@ -157,6 +159,14 @@ public class MaternalDeliverModel extends BaseModel {
      */
     private Integer isClose;
 
+    public Map<String, Object> getHandDueWeek() {
+        return handDueWeek;
+    }
+
+    public void setHandDueWeek(Map<String, Object> handDueWeek) {
+        this.handDueWeek = handDueWeek;
+    }
+
     public Integer getDueCount() {
         return dueCount;
     }
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 2f87b91..74b0c34 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
@@ -21,6 +21,8 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     /**新加字段***/
     //产次
     private Integer dueCount;
+    //手工分娩孕周
+    private Map handDueWeek;
     //
     private String pid;
     //产妇id
@@ -96,6 +98,14 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
     private YunBookbuildingAddRequest patient;
 
+    public Map getHandDueWeek() {
+        return handDueWeek;
+    }
+
+    public void setHandDueWeek(Map handDueWeek) {
+        this.handDueWeek = handDueWeek;
+    }
+
     public YunBookbuildingAddRequest getPatient() {
         return patient;
     }
@@ -203,6 +213,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     @Override
     public MaternalDeliverModel convertToDataModel() {
         MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
+        maternalDeliverModel.setHandDueWeek(handDueWeek);
         maternalDeliverModel.setDueCount(dueCount);
         maternalDeliverModel.setFmType(fmType);
         maternalDeliverModel.setFmAddr(fmAddr);
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 34cb4fc..ae779bc 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
@@ -7,6 +7,7 @@ import com.lyms.platform.pojo.Patients;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 分娩信息记录表
@@ -29,6 +30,9 @@ public class MatDeliverListResult {
     //高危因素
     private List riskFactor;
 
+    //手工分娩孕周
+    private Map handDueWeek;
+
     public List getRiskFactor() {
         return riskFactor;
     }
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 e4a500b..6b39d5c 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
@@ -20,6 +20,8 @@ public class MaternalDeliverResult  {
     private String parentId;
     //分娩时间
     private String dueDate;
+    //手工分娩孕周
+    private Map<String,Object> handDueWeek;
     //分娩孕周
     private String dueWeek;
     //  产次
@@ -94,12 +96,21 @@ public class MaternalDeliverResult  {
         this.dueCount = dueCount;
     }
 
+    public Map<String, Object> getHandDueWeek() {
+        return handDueWeek;
+    }
+
+    public void setHandDueWeek(Map<String, Object> handDueWeek) {
+        this.handDueWeek = handDueWeek;
+    }
+
     public void setDeathCauseText(String deathCauseText) {
         this.deathCauseText = deathCauseText;
     }
 
     public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
         setDueCount(destModel.getDueCount());
+        setHandDueWeek(destModel.getHandDueWeek());
         setFmAddr(destModel.getFmAddr());
         setFmType(destModel.getFmType());
         setId(destModel.getId());
-- 
1.8.3.1