From f5b7e8482d4687e62a1cdf1567ebb94caed9d243 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 8 Mar 2017 13:53:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E5=8D=B1=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=AD=95=E5=91=A8=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/result/RiskPatientsResult.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
index f00969a..89a573e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
@@ -335,10 +335,17 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
         setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
-        if(null!=destModel.getLastMenses()){
-            int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
-            this.dueWeek=StringUtils.dueWeek(days);
+        if (null != destModel.getDueStatus() && 1 == destModel.getDueStatus()) {
+            this.dueWeek = "终止妊娠";
+        } else if (3 == destModel.getType()) {
+            this.dueWeek = "已分娩";
+        } else {
+            if(null!=destModel.getLastMenses()){
+                int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
+                this.dueWeek=StringUtils.dueWeek(days);
+            }
         }
+
         setPid(destModel.getPid());
 
         if(null!=destModel.getServiceType()){
-- 
1.8.3.1