From b6882ce92b634ba1ff4303cf99591b5549e22943 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 12 Aug 2016 09:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/result/QuanChanResult.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index 84f82b0..e33d1e8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -150,8 +150,15 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
         setName(destModel.getUsername());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
         if (null != destModel.getFmDate()) {
-            setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
-            setcTime(DateUtil.daysBetween(destModel.getFmDate(),new Date())+"天");
+            Integer dueStatus = destModel.getDueStatus();
+            if(null==dueStatus){
+                setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
+            }else if(1==dueStatus){
+                setDueWeek("已分娩");
+            }else{
+                setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
+            }
+            setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天");
         }
         setPid(destModel.getPid());
         setcTimes(33);
-- 
1.8.3.1