From f50da8f0ce76162deb21462133a40e20aa9017a4 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 6 Sep 2016 14:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/result/MatDeliverListResult.java   | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

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 41bfc95..ab149ec 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
@@ -50,6 +50,9 @@ public class MatDeliverListResult {
     private String tireNumber1;
     private String status="0";
 
+    //分娩时间，补录时使用
+    private String dueDate;
+
     private List data = new ArrayList();
 
     public String getIsGravida() {
@@ -120,10 +123,18 @@ public class MatDeliverListResult {
             int day = (days % 7);
             this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
         }
-
+        if (null != patients.getFmDate()) {
+            this.dueDate = DateUtil.getyyyy_MM_dd(patients.getFmDate());
+        }
         return this;
     }
+    public String getDueDate() {
+        return dueDate;
+    }
 
+    public void setDueDate(String dueDate) {
+        this.dueDate = dueDate;
+    }
     public void setRiskFactor(List riskFactor) {
         this.riskFactor = riskFactor;
     }
@@ -216,30 +227,17 @@ public class MatDeliverListResult {
         private String checkTime;
         private String enableEdit = "0";
 
-        //分娩时间，补录时使用
-        private String dueDate;
 
-        public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime, Integer buildType, Date dueDate) {
+
+        public MatDeliverExt(MaternalDeliverModel deliverModel) {
             setCheckTime(deliverModel.getDueDate());
             setId(deliverModel.getId());
             setHospitalId(deliverModel.getHospitalId());
             setHospitalName(deliverModel.getFmHospital());
-            if (null != deliverModel.getDueDate()) {
+      /*      if (null != deliverModel.getDueDate()) {
                 Date date = DateUtil.parseYMD(deliverModel.getDueDate());
 
-            }
-
-            if (null != dueDate) {
-                this.dueDate = DateUtil.getyyyy_MM_dd(dueDate);
-            }
-        }
-
-        public String getDueDate() {
-            return dueDate;
-        }
-
-        public void setDueDate(String dueDate) {
-            this.dueDate = dueDate;
+            }*/
         }
 
         public String getEnableEdit() {
-- 
1.8.3.1