From 61e49a378aefda63173e2cd387f5c5cf94b17960 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 8 Aug 2016 15:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/result/RiskPatientsResult.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 8c35ba2..f2d9b40 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
@@ -10,6 +10,8 @@ import com.lyms.platform.operate.web.request.BasePageQueryRequest;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.PuerperaModel;
 
+import java.util.Date;
+
 /**
  * 高危孕妇管理查询
  * <p>
@@ -164,7 +166,6 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setId(destModel.getId());
         setName(destModel.getUsername());
         setAge(destModel.getAge());
-        setDueWeek("孕周");
         setrLevel(destModel.getRiskLevelId());
         setrFactor(destModel.getRiskFactorId() == null ? "" : JsonUtil.array2JsonString(destModel.getRiskFactorId()));
         sethScore(destModel.getRiskScore());
@@ -172,7 +173,13 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
         setCheckDoctor(destModel.getLastReportDoctorName());
-        setlName("登记人");
+        if(null!=destModel.getLastMenses()){
+            int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
+            String week= (days/7)+"";
+            int day = (days%7);
+            this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+        }
+        setlName(destModel.getPublishName());
         setPid(destModel.getPid());
         return this;
     }
-- 
1.8.3.1