From a69c783fd13b4e01f50e60bd19ee2363f489168c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 30 Aug 2016 09:19:22 +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/ApplyOrderOutResult.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 22b4307..6c27bea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -316,7 +316,7 @@ public class ApplyOrderOutResult { setScore(destModel.getScore()); if(null!=destModel.getDueDate()){ int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); - if(-1==days){ + if(-1==destModel.getDueWeek()){ setDueWeek("已分娩"); }else{ setDueWeek(StringUtils.dueWeek(days)); @@ -324,8 +324,12 @@ public class ApplyOrderOutResult { } setPid(destModel.getPid()); - if(null!=destModel.getDueWeek()){ - setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); + if(null!=destModel.getDueWeek()) { + if (-1 == destModel.getDueWeek()){ + setcDueWeek("已分娩"); + }else{ + setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); + } } if(null!=destModel.getReceived()){ setReceived(DateUtil.getyyyy_MM_dd(destModel.getReceived())); -- 1.8.3.1