From 71399dd8a1f2d7b033f4718849584bbff29e0243 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 21 Oct 2022 08:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E4=BF=9D=E5=81=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyHealthFacade.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java index 69e3e2d..9f27ac3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java @@ -172,16 +172,16 @@ public class BabyHealthFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); if(StringUtils.isNotEmpty(provinceId)){ - criteria.and("provinceId").is(provinceId); + criteria.and("babyProvinceId").is(provinceId); } if(StringUtils.isNotEmpty(cityId)){ - criteria.and("cityId").is(cityId); + criteria.and("babyCityId").is(cityId); } if(StringUtils.isNotEmpty(areaId)){ - criteria.and("areaId").is(areaId); + criteria.and("babyAreaId").is(areaId); } if(StringUtils.isNotEmpty(streetId)){ - criteria.and("streetId").is(streetId); + criteria.and("babyStreetId").is(streetId); } if(null!=queryStartBirth&&null!=queryEndtBirth){ criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); @@ -204,8 +204,8 @@ public class BabyHealthFacade extends BaseServiceImpl { babyMap.put("sex", SexEnum.getTextById(babyModel.getSex())); babyMap.put("birth", DateUtil.getyyyy_MM_dd(babyModel.getBirth())); babyMap.put("mname", babyModel.getMname()); - String liveAddress = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), - babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); + String liveAddress = CommonsHelper.getResidence(babyModel.getBabyProvinceId(), babyModel.getBabyCityId(), + babyModel.getBabyAreaId(), babyModel.getBabyStreetId(), babyModel.getBabyAddress(), basicConfigService); babyMap.put("address", liveAddress); babyMap.put("mphone", babyModel.getMphone()); row.put("baby", babyMap); @@ -1056,16 +1056,16 @@ public class BabyHealthFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); if(StringUtils.isNotEmpty(provinceId)){ - criteria.and("provinceId").is(provinceId); + criteria.and("babyProvinceId").is(provinceId); } if(StringUtils.isNotEmpty(cityId)){ - criteria.and("cityId").is(cityId); + criteria.and("babyCityId").is(cityId); } if(StringUtils.isNotEmpty(areaId)){ - criteria.and("areaId").is(areaId); + criteria.and("babyAreaId").is(areaId); } if(StringUtils.isNotEmpty(streetId)){ - criteria.and("streetId").is(streetId); + criteria.and("babyStreetId").is(streetId); } if(null!=queryStartBirth&&null!=queryEndtBirth){ criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); @@ -1099,8 +1099,8 @@ public class BabyHealthFacade extends BaseServiceImpl { babyMap.put("sex", SexEnum.getTextById(babyModel.getSex())); babyMap.put("birth", DateUtil.getyyyy_MM_dd(babyModel.getBirth())); babyMap.put("mname", babyModel.getMname()); - String liveAddress = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), - babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); + String liveAddress = CommonsHelper.getResidence(babyModel.getBabyProvinceId(), babyModel.getBabyCityId(), + babyModel.getBabyAreaId(), babyModel.getBabyStreetId(), babyModel.getBabyAddress(), basicConfigService); babyMap.put("address", liveAddress); babyMap.put("mphone", babyModel.getMphone()); row.put("baby", babyMap); -- 1.8.3.1