From 12f26b73ccf15568eebe9f84295246321380e1da Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 16 Aug 2016 17:50:17 +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

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

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 ed769ef..f5092ab 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
@@ -159,6 +159,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
         setAge(destModel.getAge());
         setName(destModel.getUsername());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
+
         if (null != destModel.getFmDate()) {
             Integer dueStatus = destModel.getDueStatus();
             if(null==dueStatus){
@@ -170,6 +171,12 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
             }
             setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天");
         }
+//        全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-”
+        if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
+            setDueWeek("终止妊娠");
+        }else if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){
+            setDueWeek("-");
+        }
         setPid(destModel.getPid());
         return this;
     }
-- 
1.8.3.1