From ace37d8cce7dea4c524cb2b381a86a64c95ad147 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 11 Jul 2017 18:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E5=A8=A9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/result/AntData.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 acc5ac2..ad0d4e7 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 @@ -112,8 +112,13 @@ public class AntData extends BaseModel{ public AntData(Patients model,String hospitalName) { this.id = model.getId(); - int days = DateUtil.daysBetween(model.getLastMenses(), model.getBookbuildingDate()); - this.dueWeek = StringUtils.dueWeek(days); + if((model.getIsAutoFm()!=null&& model.getIsAutoFm() == 1)){ + this.dueWeek = "已分娩"; + }else { + int days = DateUtil.daysBetween(model.getLastMenses(), model.getBookbuildingDate()); + this.dueWeek = StringUtils.dueWeek(days); + } + this.checkTime = DateUtil.getyyyy_MM_dd(model.getBookbuildingDate()); this.created=model.getBookbuildingDate(); this.title="孕妇建档"; @@ -153,7 +158,7 @@ public class AntData extends BaseModel{ int days = DateUtil.daysBetween(dueDate,postReviewModel.getLeaveHospitalDate()); this.dueWeek= "产后"+days+"天"; this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); - this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getLeaveHospitalDate()); + this.checkTime = DateUtil.getyyyy_MM_dd(postReviewModel.getLeaveHospitalDate()); this.created=postReviewModel.getLeaveHospitalDate(); this.title="出院小结"; this.type="6"; -- 1.8.3.1