From 6e082a309e5bac6f683f66b8c7a1aa1789126075 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 8 Aug 2016 09:12:36 +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/QuanPatientsResult.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
index 192428d..e4775da 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
@@ -7,6 +7,8 @@ import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.Patients;
 
+import java.util.Date;
+
 /**
  * 全部孕妇管理
  *
@@ -149,7 +151,13 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         setId(destModel.getId());
         setName(destModel.getUsername());
         setAge(destModel.getAge());
-        setDueWeek("孕周");
+        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+"天":"");
+        }
+
         setrLevel(destModel.getRiskLevelId());
         if(null!=destModel.getNextCheckTime()) {
             setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
@@ -160,7 +168,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         setPid(destModel.getPid());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
         setCheckDoctor(destModel.getLastReportDoctorName());
-        setlName("登记人");
+        setlName(destModel.getPublishName());
         if(null!=destModel.getServiceType()){
             setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
         }
-- 
1.8.3.1