Commit 209e8d907a04281ff416f56c93073be6b97e1cee
1 parent
0cf0d1d16b
Exists in
master
and in
6 other branches
update13
Showing 1 changed file with 16 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
209e8d9
| ... | ... | @@ -2119,7 +2119,7 @@ |
| 2119 | 2119 | hospitalIds.add(earScreenListRequest.getHospitalId()); |
| 2120 | 2120 | } else { |
| 2121 | 2121 | //获取用户拥有的权限医院和条件筛选的医院交集 |
| 2122 | - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, earScreenListRequest.getOrgProvinceId(), earScreenListRequest.getOrgCityId(), earScreenListRequest.getAreaId()); | |
| 2122 | + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, earScreenListRequest.getOrgProvinceId(), earScreenListRequest.getOrgCityId(), earScreenListRequest.getOrgAreaId()); | |
| 2123 | 2123 | } |
| 2124 | 2124 | // List<String> hospital = groupsFacade.findGroupHospital(userId, false); |
| 2125 | 2125 | String[] hospitalIdArray = new String[hospitalIds.size()]; |
| 2126 | 2126 | |
| 2127 | 2127 | |
| ... | ... | @@ -2143,24 +2143,23 @@ |
| 2143 | 2143 | screenQuery.setOffset((earScreenListRequest.getPage() - 1) * earScreenListRequest.getLimit()); |
| 2144 | 2144 | screenQuery.setLimit(earScreenListRequest.getLimit()); |
| 2145 | 2145 | |
| 2146 | - BabyModelQuery modelQuery = new BabyModelQuery(); | |
| 2147 | - modelQuery.setProvinceId(earScreenListRequest.getProvinceId()); | |
| 2148 | - System.out.println(earScreenListRequest.getProvinceId()); | |
| 2149 | - modelQuery.setCityId(earScreenListRequest.getCityId()); | |
| 2150 | - modelQuery.setAreaId(earScreenListRequest.getAreaId()); | |
| 2151 | - modelQuery.setStreetId(earScreenListRequest.getStreetId()); | |
| 2152 | - modelQuery.setAreaId(earScreenListRequest.getAreaId()); | |
| 2153 | - List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery); | |
| 2154 | - System.out.println(modelQuery.convertToQuery().convertToMongoQuery()); | |
| 2155 | - | |
| 2156 | - List<String> list = new ArrayList<>(); | |
| 2157 | - if (CollectionUtils.isNotEmpty(babyModels)) { | |
| 2158 | - for (BabyModel babyModel : babyModels) { | |
| 2159 | - list.add(babyModel.getId()); | |
| 2146 | + if (StringUtils.isNotEmpty(earScreenListRequest.getProvinceId())) { | |
| 2147 | + BabyModelQuery modelQuery = new BabyModelQuery(); | |
| 2148 | + modelQuery.setProvinceId(earScreenListRequest.getProvinceId()); | |
| 2149 | + modelQuery.setCityId(earScreenListRequest.getCityId()); | |
| 2150 | + modelQuery.setAreaId(earScreenListRequest.getAreaId()); | |
| 2151 | + modelQuery.setStreetId(earScreenListRequest.getStreetId()); | |
| 2152 | + modelQuery.setAreaId(earScreenListRequest.getAreaId()); | |
| 2153 | + List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery); | |
| 2154 | + List<String> list = new ArrayList<>(); | |
| 2155 | + if (CollectionUtils.isNotEmpty(babyModels)) { | |
| 2156 | + for (BabyModel babyModel : babyModels) { | |
| 2157 | + list.add(babyModel.getId()); | |
| 2158 | + } | |
| 2160 | 2159 | } |
| 2160 | + String[] babyIdArray = new String[list.size()]; | |
| 2161 | + screenQuery.setBabyIds(list.toArray(babyIdArray)); | |
| 2161 | 2162 | } |
| 2162 | - String[] babyIdArray = new String[list.size()]; | |
| 2163 | - screenQuery.setBabyIds(list.toArray(babyIdArray)); | |
| 2164 | 2163 | //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id |
| 2165 | 2164 | if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId |
| 2166 | 2165 | BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); |