Commit 47833ae05707157acaa622fc3d7eb65175506b67
1 parent
7986df2577
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 28 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
47833ae
| ... | ... | @@ -1349,9 +1349,36 @@ |
| 1349 | 1349 | if (CollectionUtils.isEmpty(hospitalIds)) { |
| 1350 | 1350 | return RespBuilder.buildSuccess(); |
| 1351 | 1351 | } |
| 1352 | + List<Map<String, Object>> rest = new ArrayList<>(); | |
| 1353 | + BabyModelQuery babyQuery = new BabyModelQuery(); | |
| 1354 | + babyQuery.setId(babyId); | |
| 1355 | + babyQuery.setYn(YnEnums.YES.getId()); | |
| 1356 | + babyQuery.setHospitalIdList(hospitalIds); | |
| 1357 | + List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); | |
| 1358 | + if (CollectionUtils.isNotEmpty(models)) { | |
| 1359 | + BabyModel babyModel = models.get(0); | |
| 1360 | + Map<String, Object> checkRecord = new HashMap<>(); | |
| 1361 | + checkRecord.put("id", babyModel.getId()); | |
| 1362 | + checkRecord.put("pid", babyModel.getPid()); | |
| 1363 | + checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate())); | |
| 1364 | + String monthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBuildDate()); | |
| 1365 | + checkRecord.put("monthAge", monthAge); | |
| 1366 | + checkRecord.put("buildId", babyModel.getId()); | |
| 1367 | + checkRecord.put("blNo", babyModel.getBlNo()); | |
| 1368 | + checkRecord.put("type", "1"); | |
| 1369 | + checkRecord.put("hospitalId", babyModel.getHospitalId()); | |
| 1370 | + //查询建档医院 | |
| 1371 | + Organization org = organizationService.getOrganization(Integer.valueOf(babyModel.getHospitalId())); | |
| 1372 | + if (org != null) { | |
| 1373 | + checkRecord.put("hospitalName", org.getName()); | |
| 1374 | + } else { | |
| 1375 | + checkRecord.put("hospitalName", ""); | |
| 1376 | + } | |
| 1377 | + rest.add(checkRecord); | |
| 1378 | + } | |
| 1379 | + | |
| 1352 | 1380 | List<BabyEyeCheck> babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) |
| 1353 | 1381 | .with(new Sort(Sort.Direction.ASC, "checkTime")), BabyEyeCheck.class); |
| 1354 | - List<Map<String, Object>> rest = new ArrayList<>(); | |
| 1355 | 1382 | for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { |
| 1356 | 1383 | Map<String, Object> temp = new HashMap<>(); |
| 1357 | 1384 | temp.put("id", babyEyeCheck.getId()); |