From aadfdb6b068cdef44a17df5e3f6a366e7cb7e86c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 30 Aug 2016 10:14:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/result/PatientBaseResult.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index a4e52b3..9d2d702 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -129,10 +129,15 @@ public class PatientBaseResult { setRemarks(patients.getMremark()); setRiskScore("60"); - if(null!=patients.getLastMenses()){ - setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); - this.dueWeek=StringUtils.dueWeek(days); + if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { + this.dueWeek = "终止妊娠"; + } else if (3 == patients.getType()) { + this.dueWeek = "已分娩"; + } else { + if (null != patients.getLastMenses()) { + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + this.dueWeek = StringUtils.dueWeek(days); + } } return this; } -- 1.8.3.1