From 54f9149d2ee8cb1d0f631b91ddc379d4018bce4e Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 9 Jan 2017 18:00:14 +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     | 4 ++--
 1 file changed, 2 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 6f73be0..cee51a9 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
@@ -316,9 +316,9 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
             }
         }
 //        全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-”
-        if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
+        if(StringUtils.isEmpty(dueWeek)&&null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
             setDueWeek("终止妊娠");
-        }else if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){
+        }else if(StringUtils.isEmpty(dueWeek)&&null!=destModel.getBuildType() &&2==destModel.getBuildType()){
             setDueWeek("-");
         }
         if(null!=destModel.getServiceType()){
-- 
1.8.3.1