Commit 23721fedc353164b002f4c88a1faceef46bb51c7
1 parent
b5414abe05
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 28 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
23721fe
| ... | ... | @@ -488,19 +488,7 @@ |
| 488 | 488 | referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); |
| 489 | 489 | referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage()); |
| 490 | 490 | referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone()); |
| 491 | - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){ | |
| 492 | - if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){ | |
| 493 | - referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital()); | |
| 494 | - }else{ | |
| 495 | - OrganizationQuery organizationQuery = new OrganizationQuery(); | |
| 496 | - organizationQuery.setYn(YnEnums.YES.getId()); | |
| 497 | - organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital()); | |
| 498 | - List<Organization> organization = organizationService.queryOrganization(organizationQuery); | |
| 499 | - if (CollectionUtils.isNotEmpty(organization)) { | |
| 500 | - referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId()+""); | |
| 501 | - } | |
| 502 | - } | |
| 503 | - } | |
| 491 | + | |
| 504 | 492 | referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); |
| 505 | 493 | referralApplyOrderQuery.setType(applyOrderQueryRequest.getType()); |
| 506 | 494 | referralApplyOrderQuery.setNeed("1"); |
| 507 | 495 | |
| ... | ... | @@ -510,8 +498,35 @@ |
| 510 | 498 | referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); |
| 511 | 499 | //1 转入 0转出 |
| 512 | 500 | if ("1".equals(applyOrderQueryRequest.getAction())) { |
| 501 | + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){ | |
| 502 | + if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){ | |
| 503 | + referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital()); | |
| 504 | + }else{ | |
| 505 | + OrganizationQuery organizationQuery = new OrganizationQuery(); | |
| 506 | + organizationQuery.setYn(YnEnums.YES.getId()); | |
| 507 | + organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital()); | |
| 508 | + List<Organization> organization = organizationService.queryOrganization(organizationQuery); | |
| 509 | + if (CollectionUtils.isNotEmpty(organization)) { | |
| 510 | + referralApplyOrderQuery.setOutHospitalId(organization.get(0).getId()+""); | |
| 511 | + } | |
| 512 | + } | |
| 513 | + } | |
| 514 | + | |
| 513 | 515 | referralApplyOrderQuery.setTransferredHospital(hospital); |
| 514 | 516 | } else if ("0".equals(applyOrderQueryRequest.getAction())) { |
| 517 | + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){ | |
| 518 | + if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){ | |
| 519 | + referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital()); | |
| 520 | + }else{ | |
| 521 | + OrganizationQuery organizationQuery = new OrganizationQuery(); | |
| 522 | + organizationQuery.setYn(YnEnums.YES.getId()); | |
| 523 | + organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital()); | |
| 524 | + List<Organization> organization = organizationService.queryOrganization(organizationQuery); | |
| 525 | + if (CollectionUtils.isNotEmpty(organization)) { | |
| 526 | + referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId()+""); | |
| 527 | + } | |
| 528 | + } | |
| 529 | + } | |
| 515 | 530 | referralApplyOrderQuery.setOutHospitalId(hospital); |
| 516 | 531 | } |
| 517 | 532 | List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |