Commit 103c490ac94f82383b12031f090c48fa54cbaa39
1 parent
79fa440b2f
Exists in
master
and in
8 other branches
增加设置parentid
Showing 1 changed file with 14 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
103c490
| ... | ... | @@ -290,19 +290,25 @@ |
| 290 | 290 | |
| 291 | 291 | List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |
| 292 | 292 | if (CollectionUtils.isNotEmpty(orderModels)) { |
| 293 | + String zhuanCName = ""; | |
| 294 | + String zhuanRname = ""; | |
| 293 | 295 | for (ReferralApplyOrderModel applyOrderModel : orderModels) { |
| 294 | 296 | BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult(); |
| 295 | 297 | String zhuanchu = applyOrderModel.getOutHospitalId(); |
| 296 | - Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); | |
| 297 | - String zhuanCName = ""; | |
| 298 | - String zhuanRname = ""; | |
| 299 | - if (null != zhuanc) { | |
| 300 | - zhuanCName = zhuanc.getName(); | |
| 298 | + String zhuanru= applyOrderModel.getTransferredHospital(); | |
| 299 | + if(NumberUtils.isNumber(zhuanchu)){ | |
| 300 | + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); | |
| 301 | + if (null != zhuanc) { | |
| 302 | + zhuanCName = zhuanc.getName(); | |
| 303 | + } | |
| 301 | 304 | } |
| 302 | - Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu)); | |
| 303 | - if (null != zhuanc1) { | |
| 304 | - zhuanRname = zhuanc1.getName(); | |
| 305 | + if(NumberUtils.isNumber(zhuanru)){ | |
| 306 | + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru)); | |
| 307 | + if (null != zhuanc1) { | |
| 308 | + zhuanRname = zhuanc1.getName(); | |
| 309 | + } | |
| 305 | 310 | } |
| 311 | + | |
| 306 | 312 | /* BabyModelQuery babyModelQuery=new BabyModelQuery(); |
| 307 | 313 | babyModelQuery.setId(applyOrderModel.getParentId()); |
| 308 | 314 | babyModelQuery.setYn(YnEnums.YES.getId()); |