Commit 013180f43da72ef386660ff6553a2fb109f1ea2d
1 parent
d276b72fc9
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 18 additions and 1 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
View file @
013180f
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
013180f
| ... | ... | @@ -1406,6 +1406,10 @@ |
| 1406 | 1406 | temp.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():0); |
| 1407 | 1407 | temp.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():0); |
| 1408 | 1408 | temp.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():0); |
| 1409 | + //居住地 | |
| 1410 | + temp.put("hospitalName", babyEyeCheck.getHospitalName()); | |
| 1411 | + //检查医院 | |
| 1412 | + temp.put("completeAddress",babyEyeCheck.getCompleteAddress()); | |
| 1409 | 1413 | CollectionUtils.removeNullValue(temp); |
| 1410 | 1414 | restMap.add(temp); |
| 1411 | 1415 | } |
| ... | ... | @@ -2563,6 +2567,19 @@ |
| 2563 | 2567 | //Integer count = babyEyeChecks.size(); |
| 2564 | 2568 | |
| 2565 | 2569 | // List<BabyEyeCheck> datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit); |
| 2570 | + if(CollectionUtils.isNotEmpty(babyEyeChecks)){ | |
| 2571 | + for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { | |
| 2572 | + BabyModel babyModels = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); | |
| 2573 | + String address = CommonsHelper.getResidence(babyModels.getProvinceId(), babyModels.getCityId(), | |
| 2574 | + babyModels.getAreaId(), babyModels.getStreetId(), babyModels.getAddress(), basicConfigService); | |
| 2575 | + //居住地 | |
| 2576 | + babyEyeCheck.setCompleteAddress(address); | |
| 2577 | + //检查医院 | |
| 2578 | + if(StringUtils.isNotEmpty(babyEyeCheck.getHospitalId())){ | |
| 2579 | + babyEyeCheck.setHospitalName(organizationService.getOrganization(Integer.valueOf(babyEyeCheck.getHospitalId())).getName()); | |
| 2580 | + } | |
| 2581 | + } | |
| 2582 | + } | |
| 2566 | 2583 | List<Map<String, Object>> maps = setDatas(babyEyeChecks); |
| 2567 | 2584 | return RespBuilder.buildSuccess(new PageResult(count, page, limit, maps)); |
| 2568 | 2585 | } |