Commit fe4c1b2bc0a19cbed30ecf2b5bfb740786d3e817
1 parent
006a69c07b
Exists in
master
and in
6 other branches
儿童检查
Showing 2 changed files with 18 additions and 21 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
View file @
fe4c1b2
| ... | ... | @@ -3691,11 +3691,7 @@ |
| 3691 | 3691 | |
| 3692 | 3692 | public BaseResponse getBabyZyzdItems( Integer page, Integer limit, String areaId, String streetId, Date dateTime,Integer type) { |
| 3693 | 3693 | //获得区县下的街道 |
| 3694 | - List<BasicConfig> regions = getRegions(areaId,streetId); | |
| 3695 | - List<String> streetIds = new ArrayList<>(); | |
| 3696 | - for (BasicConfig region : regions) { | |
| 3697 | - streetIds.add(region.getId()); | |
| 3698 | - } | |
| 3694 | + List<String> streetIds = getRegionsStreetIds( areaId, streetId); | |
| 3699 | 3695 | BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); |
| 3700 | 3696 | if (CollectionUtils.isNotEmpty(streetIds)) |
| 3701 | 3697 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
View file @
fe4c1b2
| ... | ... | @@ -188,7 +188,24 @@ |
| 188 | 188 | { |
| 189 | 189 | query.addCriteria(Criteria.where("sendHospitalId").is(param.getSendHospitalId())); |
| 190 | 190 | } |
| 191 | + else | |
| 192 | + { | |
| 193 | + String orgProvinceId = param.getOrgProvinceId(); | |
| 194 | + if (StringUtils.isNotEmpty(orgProvinceId)) { | |
| 195 | + query.addCriteria(Criteria.where("orgProvinceId").is(orgProvinceId)); | |
| 196 | + } | |
| 191 | 197 | |
| 198 | + String orgCityId = param.getOrgCityId(); | |
| 199 | + if (StringUtils.isNotEmpty(orgCityId)) { | |
| 200 | + query.addCriteria(Criteria.where("orgCityId").is(orgCityId)); | |
| 201 | + } | |
| 202 | + | |
| 203 | + String orgAreaId = param.getOrgAreaId(); | |
| 204 | + if (StringUtils.isNotEmpty(orgAreaId)) { | |
| 205 | + query.addCriteria(Criteria.where("orgAreaId").is(orgAreaId)); | |
| 206 | + } | |
| 207 | + } | |
| 208 | + | |
| 192 | 209 | String pid = param.getPid(); |
| 193 | 210 | if (StringUtils.isNotEmpty(pid)) { |
| 194 | 211 | query.addCriteria(Criteria.where("pid").is(pid)); |
| ... | ... | @@ -201,22 +218,6 @@ |
| 201 | 218 | if (StringUtils.isNotEmpty(patientId)) { |
| 202 | 219 | query.addCriteria(Criteria.where("patientId").is(patientId)); |
| 203 | 220 | } |
| 204 | - | |
| 205 | - String orgProvinceId = param.getOrgProvinceId(); | |
| 206 | - if (StringUtils.isNotEmpty(orgProvinceId)) { | |
| 207 | - query.addCriteria(Criteria.where("orgProvinceId").is(orgProvinceId)); | |
| 208 | - } | |
| 209 | - | |
| 210 | - String orgCityId = param.getOrgCityId(); | |
| 211 | - if (StringUtils.isNotEmpty(orgCityId)) { | |
| 212 | - query.addCriteria(Criteria.where("orgCityId").is(orgCityId)); | |
| 213 | - } | |
| 214 | - | |
| 215 | - String orgAreaId = param.getOrgAreaId(); | |
| 216 | - if (StringUtils.isNotEmpty(orgAreaId)) { | |
| 217 | - query.addCriteria(Criteria.where("orgAreaId").is(orgAreaId)); | |
| 218 | - } | |
| 219 | - | |
| 220 | 221 | |
| 221 | 222 | if(StringUtils.isNotEmpty(param.getHusbandQueryNo())) |
| 222 | 223 | { |