diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 02f2ea4..47510e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1735,7 +1735,7 @@ public class MatDeliverFacade { //默认添加当前医院 hospitalList.add(hospitalId); - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); + /*DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId()); List dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { @@ -1745,7 +1745,7 @@ public class MatDeliverFacade { hospitalList.add(hosId.toString()); } } - } + }*/ // 未传入查询条件,进行院内系统进行查询 if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) { // 传入了查询条件 @@ -1925,6 +1925,22 @@ public class MatDeliverFacade { } + List currentParentIdList = matDeliverQuery.getParentIdList(); + + List townOrgIds = new ArrayList<>(); + + List patients1 = mongoTemplate.find(Query.query(Criteria.where("yn").is(YnEnums.YES.getId()).and("fmHospital").exists(true). + orOperator(Criteria.where("townOrgId").is(hospitalId), Criteria.where("townOrgId").exists(false))), Patients.class); + for (Patients p : patients1) { + townOrgIds.add(p.getId()); + } + + if (CollectionUtils.isEmpty(currentParentIdList)) { + currentParentIdList = townOrgIds; + } else { + currentParentIdList.retainAll(townOrgIds); + } + matDeliverQuery.setParentIdList(currentParentIdList); if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页 matDeliverQuery.setNeed("need"); matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit());