From 92d20a48cfbb6057bb74c9ea34f5b814174cf681 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 9 Jan 2017 18:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
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, 2 insertions(+), 4 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 cee51a9..578afc6 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
@@ -305,7 +305,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
             if(null==dueStatus){
                 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
             }else if(1==dueStatus){
-                setDueWeek("已分娩");
+                setDueWeek("终止妊娠");
             }else{
                 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
             }
@@ -316,9 +316,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
             }
         }
 //        全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-”
-        if(StringUtils.isEmpty(dueWeek)&&null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
-            setDueWeek("终止妊娠");
-        }else if(StringUtils.isEmpty(dueWeek)&&null!=destModel.getBuildType() &&2==destModel.getBuildType()){
+        if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){
             setDueWeek("-");
         }
         if(null!=destModel.getServiceType()){
-- 
1.8.3.1