diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index aaeb644..ddf6195 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -492,7 +492,7 @@ public class BabyEyeCheck extends BaseModel { /****************************************/ - //建档医院 + //检查医院 private String hospitalName; //居住地 private String completeAddress; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index cc0f542..429fb5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -1406,6 +1406,10 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():0); temp.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():0); temp.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():0); + //居住地 + temp.put("hospitalName", babyEyeCheck.getHospitalName()); + //检查医院 + temp.put("completeAddress",babyEyeCheck.getCompleteAddress()); CollectionUtils.removeNullValue(temp); restMap.add(temp); } @@ -2563,6 +2567,19 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC //Integer count = babyEyeChecks.size(); // List datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit); + if(CollectionUtils.isNotEmpty(babyEyeChecks)){ + for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { + BabyModel babyModels = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); + String address = CommonsHelper.getResidence(babyModels.getProvinceId(), babyModels.getCityId(), + babyModels.getAreaId(), babyModels.getStreetId(), babyModels.getAddress(), basicConfigService); + //居住地 + babyEyeCheck.setCompleteAddress(address); + //检查医院 + if(StringUtils.isNotEmpty(babyEyeCheck.getHospitalId())){ + babyEyeCheck.setHospitalName(organizationService.getOrganization(Integer.valueOf(babyEyeCheck.getHospitalId())).getName()); + } + } + } List> maps = setDatas(babyEyeChecks); return RespBuilder.buildSuccess(new PageResult(count, page, limit, maps)); }