jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8cb8114d2b7341f7bba294c5022f47690dc80330

Authored by dongqin
1 parent 0b2a7ca287
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

bug修复

Showing 1 changed file with 18 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 8cb8114
... ... @@ -1735,7 +1735,7 @@
1735 1735 //默认添加当前医院
1736 1736 hospitalList.add(hospitalId);
1737 1737  
1738   - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
  1738 + /*DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
1739 1739 dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId());
1740 1740 List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
1741 1741 if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
... ... @@ -1745,7 +1745,7 @@
1745 1745 hospitalList.add(hosId.toString());
1746 1746 }
1747 1747 }
1748   - }
  1748 + }*/
1749 1749 // 未传入查询条件,进行院内系统进行查询
1750 1750 if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
1751 1751 // 传入了查询条件
... ... @@ -1925,6 +1925,22 @@
1925 1925 }
1926 1926  
1927 1927  
  1928 + List<String> currentParentIdList = matDeliverQuery.getParentIdList();
  1929 +
  1930 + List<String> townOrgIds = new ArrayList<>();
  1931 +
  1932 + List<Patients> patients1 = mongoTemplate.find(Query.query(Criteria.where("yn").is(YnEnums.YES.getId()).and("fmHospital").exists(true).
  1933 + orOperator(Criteria.where("townOrgId").is(hospitalId), Criteria.where("townOrgId").exists(false))), Patients.class);
  1934 + for (Patients p : patients1) {
  1935 + townOrgIds.add(p.getId());
  1936 + }
  1937 +
  1938 + if (CollectionUtils.isEmpty(currentParentIdList)) {
  1939 + currentParentIdList = townOrgIds;
  1940 + } else {
  1941 + currentParentIdList.retainAll(townOrgIds);
  1942 + }
  1943 + matDeliverQuery.setParentIdList(currentParentIdList);
1928 1944 if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页
1929 1945 matDeliverQuery.setNeed("need");
1930 1946 matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit());