Commit b521a23ccb506f0db765e0936fa53b0510334351
1 parent
6c9f47d1eb
Exists in
master
and in
6 other branches
1
Showing 1 changed file with 11 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
b521a23
... | ... | @@ -1242,6 +1242,12 @@ |
1242 | 1242 | BabyModelQuery babyQuery = new BabyModelQuery(); |
1243 | 1243 | babyQuery.setYn(YnEnums.YES.getId()); |
1244 | 1244 | babyQuery.setPid(babayPerson.getId()); |
1245 | + | |
1246 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){ | |
1247 | + babyQuery.setExtEnable(false); | |
1248 | + } | |
1249 | + | |
1250 | + | |
1245 | 1251 | List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "buildDate", Sort.Direction.DESC); |
1246 | 1252 | |
1247 | 1253 | List<Map<String, String>> list = new ArrayList<>(); |
... | ... | @@ -1286,7 +1292,11 @@ |
1286 | 1292 | BabyModelQuery babyQuery = new BabyModelQuery(); |
1287 | 1293 | babyQuery.setYn(YnEnums.YES.getId()); |
1288 | 1294 | babyQuery.setVcCardNo(param.getVcCardNo()); |
1289 | - babyQuery.setHospitalId(param.getHospitalId()); | |
1295 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){ | |
1296 | + babyQuery.setExtEnable(false); | |
1297 | + } | |
1298 | + | |
1299 | + babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId,false)); | |
1290 | 1300 | |
1291 | 1301 | List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
1292 | 1302 | if (CollectionUtils.isNotEmpty(babyModels)) { |