Commit ef6eaae067499e4692cef0dc371230bc9607f70b
1 parent
0783de8a39
Exists in
master
and in
1 other branch
修改新电子病历
Showing 2 changed files with 4 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
ef6eaae
| ... | ... | @@ -502,15 +502,9 @@ |
| 502 | 502 | referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); |
| 503 | 503 | //1 转入 0转出 |
| 504 | 504 | if ("1".equals(applyOrderQueryRequest.getAction())) { |
| 505 | - List data = autoMatchFacade.matchOrgId(userId); | |
| 506 | - if (CollectionUtils.isNotEmpty(data)) { | |
| 507 | - referralApplyOrderQuery.setTransferredHospital(data.get(0) + ""); | |
| 508 | - } | |
| 505 | + referralApplyOrderQuery.setTransferredHospital(hospital); | |
| 509 | 506 | } else if ("0".equals(applyOrderQueryRequest.getAction())) { |
| 510 | - List data = autoMatchFacade.matchOrgId(userId); | |
| 511 | - if (CollectionUtils.isNotEmpty(data)) { | |
| 512 | - referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); | |
| 513 | - } | |
| 507 | + referralApplyOrderQuery.setOutHospitalId(hospital); | |
| 514 | 508 | } |
| 515 | 509 | List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |
| 516 | 510 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
View file @
ef6eaae
| ... | ... | @@ -317,11 +317,11 @@ |
| 317 | 317 | // setrLevel(destModel.getrLevel()); |
| 318 | 318 | if(null!=destModel.getDueDate()){ |
| 319 | 319 | int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); |
| 320 | - this.cDueWeek= StringUtils.dueWeek(days); | |
| 320 | + setDueWeek(StringUtils.dueWeek(days)); | |
| 321 | 321 | } |
| 322 | 322 | setPid(destModel.getPid()); |
| 323 | 323 | if(null!=destModel.getDueWeek()){ |
| 324 | - setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); | |
| 324 | + setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek())); | |
| 325 | 325 | } |
| 326 | 326 | if(null!=destModel.getReceived()){ |
| 327 | 327 | setReceived(DateUtil.getyyyy_MM_dd(destModel.getReceived())); |