From 73648a6cb79201357ec3a47ee1b244ef5d7f1203 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 16 Feb 2017 15:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E5=AD=90=E7=97=85?=
 =?UTF-8?q?=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 1 +
 .../platform/operate/web/result/BookbuildingRecordResult.java    | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 466226a..38bb564 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -622,6 +622,7 @@ public class BookbuildingFacade {
                             result.setHospitalId(String.valueOf(org.getId()));
                         }
                     }
+                    result.setFmTime(DateUtil.getyyyy_MM_dd(pat.getFmDate()));
                     result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));
                     result.setId(pat.getId());
                     result.setType(pat.getType());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java
index dabe4a3..c4c4b35 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java
@@ -8,6 +8,8 @@ public class BookbuildingRecordResult {
     private String id;
     //建档时间
     private String bookbuildDate;
+    //分娩时间
+    private String fmTime;
     //建档医院
     private String bookbuildHospital;
     //医院ID
@@ -16,6 +18,13 @@ public class BookbuildingRecordResult {
     //1孕妇 3产妇
     private Integer type;
 
+    public String getFmTime() {
+        return fmTime;
+    }
+
+    public void setFmTime(String fmTime) {
+        this.fmTime = fmTime;
+    }
 
     //分娩状态 0未终止妊娠 1终止妊娠
     private Integer dueStatus;
-- 
1.8.3.1