From d2310e14d234d77e1353fe5680c7fe9808fbb90c Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 1 Sep 2016 16:13:51 +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

---
 .../java/com/lyms/platform/operate/web/result/QuanChanResult.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 f5092ab..d4e3c4c 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
@@ -169,7 +169,11 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
             }else{
                 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
             }
-            setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天");
+            if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
+                setcTime("终止妊娠");
+            }else{
+                setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天");
+            }
         }
 //        全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-”
         if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
-- 
1.8.3.1