From 024252dac739d118aa2aa555adc4464072164d70 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 14 Jun 2017 10:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=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

---
 .../lyms/platform/common/enums/FmTypeEnums.java    | 12 +++++++++++
 .../lyms/platform/pojo/MaternalDeliverModel.java   | 23 ++++++++++++++++++++--
 .../platform/operate/web/facade/ViewFacade.java    |  4 ++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java
index ce74566..6fae52c 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java
@@ -110,6 +110,18 @@ public enum FmTypeEnums {
             this.name = name;
         }
     }
+
+    public static String getFmDzNameById(String id)
+    {
+        for (FmDzEnums e : FmDzEnums.values()) {
+            if (e.getId().equals(id))
+            {
+                return e.getName();
+            }
+        }
+        return null;
+    }
+
     public enum FmScEnums {
 
         O("自然娩出", "1"),
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 a930a11..603035f 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
@@ -8,7 +8,6 @@ import org.springframework.data.mongodb.core.mapping.Document;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 产妇分娩
@@ -26,7 +25,10 @@ public class MaternalDeliverModel extends BaseModel {
     private String pid;
     //分娩时间
     private String dueDate;
-
+    //分娩地址方式，本院、外院
+    private String fmType;
+    //外院地址
+    private Date fmAddr;
     private Date dueDate1;
     //分娩孕周
     private String dueWeek;
@@ -121,6 +123,22 @@ public class MaternalDeliverModel extends BaseModel {
     private Date modified;
     private String hospitalId;
 
+    public String getFmType() {
+        return fmType;
+    }
+
+    public void setFmType(String fmType) {
+        this.fmType = fmType;
+    }
+
+    public Date getFmAddr() {
+        return fmAddr;
+    }
+
+    public void setFmAddr(Date fmAddr) {
+        this.fmAddr = fmAddr;
+    }
+
     public String getHospitalId() {
         return hospitalId;
     }
@@ -281,6 +299,7 @@ public class MaternalDeliverModel extends BaseModel {
             return babyHealthy;
         }
 
+
         public void setBabyHealthy(String babyHealthy) {
             this.babyHealthy = babyHealthy;
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 9d46acb..c3a383f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -907,6 +907,10 @@ public class ViewFacade {
 
         Map<String, Object> map = new HashMap<>();
         map.put("id", data.getId());
+        if(StringUtils.isNotEmpty(data.getFmType())){
+            map.put("fmType", FmTypeEnums.getFmDzNameById(data.getFmType()));
+        }
+        map.put("fmAddr", data.getFmAddr());
         map.put("username", patients.getUsername());
         map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth()));
         map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));
-- 
1.8.3.1