From 47833ae05707157acaa622fc3d7eb65175506b67 Mon Sep 17 00:00:00 2001 From: wtt Date: Wed, 5 Aug 2020 18:00:58 +0800 Subject: [PATCH] update --- .../web/service/impl/BabyEyeCheckServiceImpl.java | 29 +++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) 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 9fcb9ed..6be7bfb 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 @@ -1349,9 +1349,36 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (CollectionUtils.isEmpty(hospitalIds)) { return RespBuilder.buildSuccess(); } + List> rest = new ArrayList<>(); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setId(babyId); + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setHospitalIdList(hospitalIds); + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(models)) { + BabyModel babyModel = models.get(0); + Map checkRecord = new HashMap<>(); + checkRecord.put("id", babyModel.getId()); + checkRecord.put("pid", babyModel.getPid()); + checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate())); + String monthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBuildDate()); + checkRecord.put("monthAge", monthAge); + checkRecord.put("buildId", babyModel.getId()); + checkRecord.put("blNo", babyModel.getBlNo()); + checkRecord.put("type", "1"); + checkRecord.put("hospitalId", babyModel.getHospitalId()); + //查询建档医院 + Organization org = organizationService.getOrganization(Integer.valueOf(babyModel.getHospitalId())); + if (org != null) { + checkRecord.put("hospitalName", org.getName()); + } else { + checkRecord.put("hospitalName", ""); + } + rest.add(checkRecord); + } + List babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) .with(new Sort(Sort.Direction.ASC, "checkTime")), BabyEyeCheck.class); - List> rest = new ArrayList<>(); for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { Map temp = new HashMap<>(); temp.put("id", babyEyeCheck.getId()); -- 1.8.3.1