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 = 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 = 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 = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organization)) { + referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId()+""); + } + } + } referralApplyOrderQuery.setOutHospitalId(hospital); } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);