From f330b0303f25a3c9afc23cdda40640c1593b021f Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 26 Jun 2017 16:54:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B7bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/ViewFacade.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 7369b73..aa12050 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -361,7 +361,10 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(orderModels)) { boolean isZhuan = false; for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 - if (raom.getCreated().before(data.getCheckDate())) { + String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckDate()); + String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); + + if (raom.getCreated().before(data.getCheckDate())||checkTime.equals(Created)) { isZhuan = true; continue; } @@ -1005,7 +1008,6 @@ public class ViewFacade { } } if (StringUtils.isNotEmpty(data.getbChao())) - { map.put("bChao", data.getbChao()); } @@ -1019,7 +1021,9 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(orderModels)) { boolean isZhuan = false; for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 - if (raom.getCreated().before(data.getCheckTime())) { + String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckTime()); + String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); + if (raom.getCreated().before(data.getCheckTime())||checkTime.equals(Created)) { isZhuan = true; continue; } -- 1.8.3.1