From 2a440a4e6f7d3448b979d07e25095da256016448 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 17 Aug 2016 16:45:33 +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 --- .../java/com/lyms/platform/operate/web/facade/PostReviewFacade.java | 2 +- .../com/lyms/platform/operate/web/result/PostReviewListResult.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 6caf613..138b746 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -154,7 +154,7 @@ public class PostReviewFacade { if(null!=organization){ hospitalName=organization.getName(); } - dataList.add(new PostReviewListResult.AntData(model,hospitalName)); + dataList.add(new PostReviewListResult.AntData(model,hospitalName,patientsList.getFmDate())); } } postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java index 7778e33..a3e704b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java @@ -172,6 +172,7 @@ public class PostReviewListResult { } int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); this.dueWeek = StringUtils.dueWeek(days); + if (null != patients.getLastMenses()) { setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } @@ -187,9 +188,10 @@ public class PostReviewListResult { private String hospitalName; private String hospitalId; - public AntData(PostReviewModel model, String hospitalName) { + public AntData(PostReviewModel model, String hospitalName,Date dueDate) { this.id = model.getId(); - this.dueWeek = model.getDay(); + int days = DateUtil.daysBetween(dueDate,model.getCheckTime()); + this.dueWeek= "产后"+days+"天"; this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime()); this.hospitalId = model.getHospitalId(); this.hospitalName = hospitalName; -- 1.8.3.1