From 23721fedc353164b002f4c88a1faceef46bb51c7 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 31 Aug 2016 11:06:10 +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

---
 .../operate/web/facade/ApplyOrderFacade.java       | 41 +++++++++++++++-------
 1 file changed, 28 insertions(+), 13 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 0c69c59..06da453 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
@@ -488,19 +488,7 @@ public class ApplyOrderFacade {
         referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo());
         referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage());
         referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone());
-        if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){
-            if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){
-                referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
-            }else{
-                OrganizationQuery organizationQuery = new OrganizationQuery();
-                organizationQuery.setYn(YnEnums.YES.getId());
-                organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital());
-                List<Organization> organization = organizationService.queryOrganization(organizationQuery);
-                if (CollectionUtils.isNotEmpty(organization)) {
-                    referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId()+"");
-                }
-            }
-        }
+
         referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
         referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
         referralApplyOrderQuery.setNeed("1");
@@ -510,8 +498,35 @@ public class ApplyOrderFacade {
         referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
         //1 转入  0转出
         if ("1".equals(applyOrderQueryRequest.getAction())) {
+            if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){
+                if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){
+                    referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital());
+                }else{
+                    OrganizationQuery organizationQuery = new OrganizationQuery();
+                    organizationQuery.setYn(YnEnums.YES.getId());
+                    organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital());
+                    List<Organization> organization = organizationService.queryOrganization(organizationQuery);
+                    if (CollectionUtils.isNotEmpty(organization)) {
+                        referralApplyOrderQuery.setOutHospitalId(organization.get(0).getId()+"");
+                    }
+                }
+            }
+
             referralApplyOrderQuery.setTransferredHospital(hospital);
         } else if ("0".equals(applyOrderQueryRequest.getAction())) {
+            if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){
+                if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){
+                    referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
+                }else{
+                    OrganizationQuery organizationQuery = new OrganizationQuery();
+                    organizationQuery.setYn(YnEnums.YES.getId());
+                    organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital());
+                    List<Organization> organization = organizationService.queryOrganization(organizationQuery);
+                    if (CollectionUtils.isNotEmpty(organization)) {
+                        referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId()+"");
+                    }
+                }
+            }
             referralApplyOrderQuery.setOutHospitalId(hospital);
         }
         List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
-- 
1.8.3.1