fangcheng / regional-platform

Download as
Browse Code »

Commit de1d27ff9fb7571028afa6bf1a0478f01d9efc29

Authored by hanshaofeng
2 parents e7908690b4 675b63ba07
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ de1d27f
... ... @@ -1447,7 +1447,14 @@
1447 1447 List<String> hospitalIdList = new ArrayList<>();
1448 1448 if(request.getHospitalId()==null){
1449 1449 // 没有传入医院，取所有有权限的医院
1450   - List<Organization> organizationList = organizationService.queryHospital();
  1450 + OrganizationQuery organizationQuery = new OrganizationQuery();
  1451 + List<Integer> typeList = new ArrayList<>();
  1452 + typeList.add(OrganizationTypeEnum.NY.getId());
  1453 + typeList.add(OrganizationTypeEnum.FB.getId());
  1454 + typeList.add(OrganizationTypeEnum.JMQY.getId());
  1455 + typeList.add(OrganizationTypeEnum.TY.getId());
  1456 + organizationQuery.setTypeList(typeList);
  1457 + List<Organization> organizationList = organizationService.queryOrganization(organizationQuery);
1451 1458 for (Organization organization : organizationList) {
1452 1459 hospitalIdList.add(String.valueOf(organization.getId()));
1453 1460 }
... ... @@ -1880,6 +1887,12 @@
1880 1887 QueryHospitalListResult queryHospitalListResult = new QueryHospitalListResult();
1881 1888 OrganizationQuery organizationQuery = new OrganizationQuery();
1882 1889 BeanUtils.copy(queryHospitalListRequest,organizationQuery);
  1890 + List<Integer> typeList = new ArrayList<>();
  1891 + typeList.add(OrganizationTypeEnum.NY.getId());
  1892 + typeList.add(OrganizationTypeEnum.FB.getId());
  1893 + typeList.add(OrganizationTypeEnum.JMQY.getId());
  1894 + typeList.add(OrganizationTypeEnum.TY.getId());
  1895 + organizationQuery.setTypeList(typeList);
1883 1896 List<Organization> organizationList = organizationService.queryOrganization(organizationQuery);
1884 1897 List<HospitalQueryModel> hospitalQueryModelList = new ArrayList<>();
1885 1898 if (organizationList!=null&&organizationList.size()>0){