Commit 432724903bd1a9c5caf1f050ba52f35a6530ac40
1 parent
03896a5ef8
Exists in
master
and in
6 other branches
update
Showing 4 changed files with 13 additions and 5 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
4327249
| ... | ... | @@ -3628,7 +3628,7 @@ |
| 3628 | 3628 | //衡水区域并且不是衡水市第六人民医院 |
| 3629 | 3629 | if("12".equals(og.getCityId()) && !"2100002324".equals(hospitalId)) |
| 3630 | 3630 | { |
| 3631 | - currentGroupHospital.remove("2100002324");//排查冀州妇幼 | |
| 3631 | + currentGroupHospital.remove("2100002324");//衡水市第六人民医院 | |
| 3632 | 3632 | } |
| 3633 | 3633 | |
| 3634 | 3634 | if (!StringUtils.isEmpty(queryRequest.getPatientId())) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
4327249
| ... | ... | @@ -1498,10 +1498,10 @@ |
| 1498 | 1498 | } |
| 1499 | 1499 | |
| 1500 | 1500 | |
| 1501 | - //衡水区域并且不是冀州妇幼登陆 | |
| 1501 | + //衡水区域并且不是衡水市第六人民医院 | |
| 1502 | 1502 | if("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId)) |
| 1503 | 1503 | { |
| 1504 | - hids.remove("2100002324");//排查冀州妇幼 | |
| 1504 | + hids.remove("2100002324");//衡水六院登陆 | |
| 1505 | 1505 | } |
| 1506 | 1506 | |
| 1507 | 1507 | if (CollectionUtils.isNotEmpty(hids)) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
4327249
| ... | ... | @@ -1352,10 +1352,10 @@ |
| 1352 | 1352 | List<String> hids = organizationGroupsFacade.findGroupHospital(userId, false); |
| 1353 | 1353 | |
| 1354 | 1354 | |
| 1355 | - //衡水区域并且不是冀州妇幼登陆 | |
| 1355 | + //衡水区域并且不是衡水市第六人民医院 | |
| 1356 | 1356 | if("12".equals(og.getCityId()) && !"2100002324".equals(hospital)) |
| 1357 | 1357 | { |
| 1358 | - hids.remove("2100002324");//排查冀州妇幼 | |
| 1358 | + hids.remove("2100002324");//衡水六院登陆 | |
| 1359 | 1359 | } |
| 1360 | 1360 | |
| 1361 | 1361 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
4327249
| ... | ... | @@ -490,6 +490,14 @@ |
| 490 | 490 | hospitalList.retainAll(orgId); |
| 491 | 491 | } |
| 492 | 492 | } |
| 493 | + | |
| 494 | + //衡水区域并且不是衡水市第六人民医院 | |
| 495 | + if(!"2100002324".equals(hospital)) | |
| 496 | + { | |
| 497 | + hospitalList.remove("2100002324");//衡水六院登陆 | |
| 498 | + } | |
| 499 | + | |
| 500 | + | |
| 493 | 501 | patientsQuery.setHospitalList(hospitalList); |
| 494 | 502 | |
| 495 | 503 | fmHospitalList.addAll(hospitalList); |