From 96b992b4d21736df88f1594f1c555b8610288f9e Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 14 Jun 2017 10:25:55 +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

---
 .../operate/web/result/MaternalDeliverResult.java  | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

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 2a7bcea..a473fce 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
@@ -1,10 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
-import com.lyms.platform.common.enums.SexEnum;
 import com.lyms.platform.common.utils.JsonUtil;
-import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.MaternalDeliverModel;
-import net.sf.ezmorph.bean.MorphDynaBean;
 import org.codehaus.jackson.map.ObjectMapper;
 
 import java.io.IOException;
@@ -33,6 +30,10 @@ public class MaternalDeliverResult  {
     private List<Placenta> placentas;
     //分娩方式
     private Map deliveryMode;
+    //分娩地址 本院、外院
+    private String fmType;
+    //外院地址
+    private String fmAddr;
     //手术原因
     private String operationCause;
     //产程  h 小时  m 分
@@ -88,6 +89,8 @@ public class MaternalDeliverResult  {
     }
 
     public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
+        setFmAddr(destModel.getFmAddr());
+        setFmType(destModel.getFmType());
         setId(destModel.getId());
         setParentId(destModel.getParentId());
         setDeathCauseText(destModel.getDeathCauseText());
@@ -536,6 +539,22 @@ public class MaternalDeliverResult  {
         return chBp;
     }
 
+    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 void setChBp(Map chBp) {
         this.chBp = chBp;
     }
-- 
1.8.3.1