From 1fbf2ea251497790d255a9a86339f5c70ea4ef6a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 12 Aug 2016 15:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/result/AntData.java  | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
index 54e2057..4f3fb40 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.*;
 
 import java.util.Date;
@@ -62,10 +63,7 @@ public class AntData {
 
     public AntData(AntExChuModel model,String hospitalName) {
         this.id = model.getId();
-        int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
-        String week = (days / 7) + "";
-        int day = (days % 7);
-        this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
+        this.dueWeek = model.getcDueWeek();
         if(null!=model.getCheckTime()){
             this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime());
         }
@@ -78,10 +76,8 @@ public class AntData {
 
     public AntData(Patients model,String hospitalName) {
         this.id = model.getId();
-        int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
-        String week = (days / 7) + "";
-        int day = (days % 7);
-        this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
+        int days = DateUtil.daysBetween(model.getLastMenses(), model.getCreated());
+        this.dueWeek = StringUtils.dueWeek(days);
         this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
         this.title="孕妇建档";
         this.type="1";
@@ -92,9 +88,7 @@ public class AntData {
     public AntData(MaternalDeliverModel model,Date lastMenses,String hospitalName) {
         this.id = model.getId();
         int days = DateUtil.daysBetween(lastMenses,model.getCreated());
-        String week = (days / 7) + "";
-        int day = (days % 7);
-        this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
+        this.dueWeek = StringUtils.dueWeek(days);
         this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
         this.title="孕妇分娩";
         this.type="4";
@@ -115,14 +109,12 @@ public class AntData {
     public AntData(StopPregModel postReviewModel,Date lastMenses,String hospitalName) {
         this.id=postReviewModel.getId();
         int days= DateUtil.daysBetween(lastMenses,postReviewModel.getStopDate());
-        String week= (days/7)+"";
-        int day = (days%7);
-        this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+        this.dueWeek=StringUtils.dueWeek(days);
         this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getCreated());
         this.title="终止妊娠";
         this.type="6";
         this.hospitalName=hospitalName;
-        this.hospitalId="医院id";
+        this.hospitalId=postReviewModel.getHospitalId();
     }
 
     public String getCheckTime() {
-- 
1.8.3.1