Commit 0a1b7a2c42a30b02b75e3dd52bdf9752a147f660
1 parent
f36491d1fd
Exists in
dev
fix:优化儿童转诊相关逻辑
Showing 2 changed files with 13 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
0a1b7a2
| ... | ... | @@ -385,7 +385,8 @@ |
| 385 | 385 | referralApplyScreeningQuery.setAction(applyScreeningQueryRequest.getAction()); |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - | |
| 388 | + referralApplyScreeningQuery.setOutDepartment(applyScreeningQueryRequest.getOutDepartment()); | |
| 389 | + referralApplyScreeningQuery.setTransferredDepartment(applyScreeningQueryRequest.getTransferredDepartment()); | |
| 389 | 390 | List<ReferralApplyScreeningModel> screeningModels = |
| 390 | 391 | applyScreeningService.queryReferralApplyScreeningWithQuery(referralApplyScreeningQuery); |
| 391 | 392 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java
View file @
0a1b7a2
| ... | ... | @@ -78,6 +78,10 @@ |
| 78 | 78 | map.put("xlzk", "心理专科检查"); |
| 79 | 79 | map.put("fych", "发育迟缓检查"); |
| 80 | 80 | map.put("gwer", "高危儿检查"); |
| 81 | + map.put("产科", "产科"); | |
| 82 | + map.put("新生儿病房", "新生儿病房"); | |
| 83 | + map.put("新生儿门诊", "新生儿门诊"); | |
| 84 | + map.put("儿童保健科", "儿童保健科"); | |
| 81 | 85 | } |
| 82 | 86 | |
| 83 | 87 | private DepartmentReferralModel getDepartmentReferralModel(BabyDepartmentReferralRequest request) { |
| ... | ... | @@ -319,6 +323,10 @@ |
| 319 | 323 | list.add("xlzk"); |
| 320 | 324 | list.add("fych"); |
| 321 | 325 | list.add("gwer"); |
| 326 | + list.add("产科"); | |
| 327 | + list.add("新生儿病房"); | |
| 328 | + list.add("新生儿门诊"); | |
| 329 | + list.add("儿童保健科"); | |
| 322 | 330 | if("1".equals(babyQuery.getAction())){ |
| 323 | 331 | if(StringUtils.isEmpty(babyQuery.getZcks())){ |
| 324 | 332 | babyQuery.setZckss(list); |
| ... | ... | @@ -446,6 +454,9 @@ |
| 446 | 454 | model.setStatus(2); |
| 447 | 455 | model.setAcceptDate(new Date()); |
| 448 | 456 | } |
| 457 | + }else { | |
| 458 | + model.setStatus(2); | |
| 459 | + model.setAcceptDate(new Date()); | |
| 449 | 460 | } |
| 450 | 461 | } |
| 451 | 462 | } |