From ef6eaae067499e4692cef0dc371230bc9607f70b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 29 Aug 2016 10:33:29 +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 --- .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 10 ++-------- .../lyms/platform/operate/web/result/ApplyOrderOutResult.java | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 3dfa246..8df73d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -502,15 +502,9 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) { - List data = autoMatchFacade.matchOrgId(userId); - if (CollectionUtils.isNotEmpty(data)) { - referralApplyOrderQuery.setTransferredHospital(data.get(0) + ""); - } + referralApplyOrderQuery.setTransferredHospital(hospital); } else if ("0".equals(applyOrderQueryRequest.getAction())) { - List data = autoMatchFacade.matchOrgId(userId); - if (CollectionUtils.isNotEmpty(data)) { - referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); - } + referralApplyOrderQuery.setOutHospitalId(hospital); } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); 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 f3cdee1..03fb0a3 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 @@ -317,11 +317,11 @@ public class ApplyOrderOutResult { // setrLevel(destModel.getrLevel()); if(null!=destModel.getDueDate()){ int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); - this.cDueWeek= StringUtils.dueWeek(days); + setDueWeek(StringUtils.dueWeek(days)); } setPid(destModel.getPid()); if(null!=destModel.getDueWeek()){ - setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); + 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