From c445605ae9650cb7c25cbd0aefa049abe26c9e33 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 14 Jun 2017 10:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E5=A8=A9=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/pojo/MaternalDeliverModel.java   |  6 +++---
 .../operate/web/request/MatDeliverAddRequest.java  | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

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 603035f..733d283 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
@@ -28,7 +28,7 @@ public class MaternalDeliverModel extends BaseModel {
     //分娩地址方式，本院、外院
     private String fmType;
     //外院地址
-    private Date fmAddr;
+    private String fmAddr;
     private Date dueDate1;
     //分娩孕周
     private String dueWeek;
@@ -131,11 +131,11 @@ public class MaternalDeliverModel extends BaseModel {
         this.fmType = fmType;
     }
 
-    public Date getFmAddr() {
+    public String getFmAddr() {
         return fmAddr;
     }
 
-    public void setFmAddr(Date fmAddr) {
+    public void setFmAddr(String fmAddr) {
         this.fmAddr = fmAddr;
     }
 
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 c87e5a7..952e549 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
@@ -33,6 +33,10 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     private List<Placenta> placentas;
     //胎盘及新生儿
     private List<MaternalDeliverModel.ExtPlacenta> extPlacentas;
+    //分娩地址方式，本院、外院
+    private String fmType;
+    //外院地址
+    private String fmAddr;
     //分娩方式
     private Map deliveryMode;
     //手术原因
@@ -125,6 +129,22 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         this.extPlacentas = extPlacentas;
     }
 
+    public String getFmType() {
+        return fmType;
+    }
+
+    public void setFmType(String fmType) {
+        this.fmType = fmType;
+    }
+
+    public String getFmAddr() {
+        return fmAddr;
+    }
+
+    public void setFmAddr(String fmAddr) {
+        this.fmAddr = fmAddr;
+    }
+
     public Double getoHloseBloodL() {
         return oHloseBloodL;
     }
@@ -160,6 +180,8 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     @Override
     public MaternalDeliverModel convertToDataModel() {
         MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
+        maternalDeliverModel.setFmType(fmType);
+        maternalDeliverModel.setFmAddr(fmAddr);
         maternalDeliverModel.setParentId(parentId);
         maternalDeliverModel.setDueDate(dueDate);
         maternalDeliverModel.setDueWeek(dueWeek);
-- 
1.8.3.1