Commit 71399dd8a1f2d7b033f4718849584bbff29e0243
1 parent
8378748fe5
Exists in
master
and in
6 other branches
儿童保健
Showing 1 changed file with 12 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
View file @
71399dd
| ... | ... | @@ -172,16 +172,16 @@ |
| 172 | 172 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 173 | 173 | Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); |
| 174 | 174 | if(StringUtils.isNotEmpty(provinceId)){ |
| 175 | - criteria.and("provinceId").is(provinceId); | |
| 175 | + criteria.and("babyProvinceId").is(provinceId); | |
| 176 | 176 | } |
| 177 | 177 | if(StringUtils.isNotEmpty(cityId)){ |
| 178 | - criteria.and("cityId").is(cityId); | |
| 178 | + criteria.and("babyCityId").is(cityId); | |
| 179 | 179 | } |
| 180 | 180 | if(StringUtils.isNotEmpty(areaId)){ |
| 181 | - criteria.and("areaId").is(areaId); | |
| 181 | + criteria.and("babyAreaId").is(areaId); | |
| 182 | 182 | } |
| 183 | 183 | if(StringUtils.isNotEmpty(streetId)){ |
| 184 | - criteria.and("streetId").is(streetId); | |
| 184 | + criteria.and("babyStreetId").is(streetId); | |
| 185 | 185 | } |
| 186 | 186 | if(null!=queryStartBirth&&null!=queryEndtBirth){ |
| 187 | 187 | criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); |
| ... | ... | @@ -204,8 +204,8 @@ |
| 204 | 204 | babyMap.put("sex", SexEnum.getTextById(babyModel.getSex())); |
| 205 | 205 | babyMap.put("birth", DateUtil.getyyyy_MM_dd(babyModel.getBirth())); |
| 206 | 206 | babyMap.put("mname", babyModel.getMname()); |
| 207 | - String liveAddress = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), | |
| 208 | - babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); | |
| 207 | + String liveAddress = CommonsHelper.getResidence(babyModel.getBabyProvinceId(), babyModel.getBabyCityId(), | |
| 208 | + babyModel.getBabyAreaId(), babyModel.getBabyStreetId(), babyModel.getBabyAddress(), basicConfigService); | |
| 209 | 209 | babyMap.put("address", liveAddress); |
| 210 | 210 | babyMap.put("mphone", babyModel.getMphone()); |
| 211 | 211 | row.put("baby", babyMap); |
| 212 | 212 | |
| 213 | 213 | |
| 214 | 214 | |
| ... | ... | @@ -1056,16 +1056,16 @@ |
| 1056 | 1056 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 1057 | 1057 | Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); |
| 1058 | 1058 | if(StringUtils.isNotEmpty(provinceId)){ |
| 1059 | - criteria.and("provinceId").is(provinceId); | |
| 1059 | + criteria.and("babyProvinceId").is(provinceId); | |
| 1060 | 1060 | } |
| 1061 | 1061 | if(StringUtils.isNotEmpty(cityId)){ |
| 1062 | - criteria.and("cityId").is(cityId); | |
| 1062 | + criteria.and("babyCityId").is(cityId); | |
| 1063 | 1063 | } |
| 1064 | 1064 | if(StringUtils.isNotEmpty(areaId)){ |
| 1065 | - criteria.and("areaId").is(areaId); | |
| 1065 | + criteria.and("babyAreaId").is(areaId); | |
| 1066 | 1066 | } |
| 1067 | 1067 | if(StringUtils.isNotEmpty(streetId)){ |
| 1068 | - criteria.and("streetId").is(streetId); | |
| 1068 | + criteria.and("babyStreetId").is(streetId); | |
| 1069 | 1069 | } |
| 1070 | 1070 | if(null!=queryStartBirth&&null!=queryEndtBirth){ |
| 1071 | 1071 | criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); |
| ... | ... | @@ -1099,8 +1099,8 @@ |
| 1099 | 1099 | babyMap.put("sex", SexEnum.getTextById(babyModel.getSex())); |
| 1100 | 1100 | babyMap.put("birth", DateUtil.getyyyy_MM_dd(babyModel.getBirth())); |
| 1101 | 1101 | babyMap.put("mname", babyModel.getMname()); |
| 1102 | - String liveAddress = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), | |
| 1103 | - babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); | |
| 1102 | + String liveAddress = CommonsHelper.getResidence(babyModel.getBabyProvinceId(), babyModel.getBabyCityId(), | |
| 1103 | + babyModel.getBabyAreaId(), babyModel.getBabyStreetId(), babyModel.getBabyAddress(), basicConfigService); | |
| 1104 | 1104 | babyMap.put("address", liveAddress); |
| 1105 | 1105 | babyMap.put("mphone", babyModel.getMphone()); |
| 1106 | 1106 | row.put("baby", babyMap); |