Commit 38c856c51c052bb195044bd1743fa207e63f6bb6
1 parent
95c7e0c5bc
Exists in
master
and in
1 other branch
分娩修改
Showing 1 changed file with 10 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
38c856c
| ... | ... | @@ -384,8 +384,6 @@ |
| 384 | 384 | hospitalList = new ArrayList<>(); |
| 385 | 385 | fmHospitalList = new ArrayList<>(); |
| 386 | 386 | |
| 387 | - fmHospitalList.add(riskPatientsQueryRequest.getFmHospital()); | |
| 388 | - | |
| 389 | 387 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 390 | 388 | if (null != hospital) { |
| 391 | 389 | hospitalList.add(hospital); |
| 392 | 390 | |
| 393 | 391 | |
| ... | ... | @@ -454,10 +452,18 @@ |
| 454 | 452 | } |
| 455 | 453 | fmHospitalList.retainAll(orgId); |
| 456 | 454 | } |
| 457 | - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId())) | |
| 455 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) | |
| 458 | 456 | { |
| 459 | - patientsQuery.setFmHospitalList(fmHospitalList); | |
| 457 | + fmHospitalList.add(riskPatientsQueryRequest.getFmHospital()); | |
| 460 | 458 | } |
| 459 | + else | |
| 460 | + { | |
| 461 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId())) | |
| 462 | + { | |
| 463 | + patientsQuery.setFmHospitalList(fmHospitalList); | |
| 464 | + } | |
| 465 | + } | |
| 466 | + | |
| 461 | 467 | |
| 462 | 468 | |
| 463 | 469 | } else { |