diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 1859922..d124c0a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -330,18 +330,23 @@ public class BabyNutritionFacade { map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getNutritiTime())); - // 回退版本 - String currInterpretDoctorId = model.getInterpretDoctorId(); - // 新增报表解读人和结算状态 - /* HealthChargeModel chargeModel = mongoTemplate.findOne(Query.query(Criteria.where("babyNutritionId").is(model.getId())), HealthChargeModel.class); - String currInterpretDoctorId = chargeModel.getDoctorId();*/ + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + healthChargeQuery.setBabyNutritionId(model.getId()); + List list = healthChargeService.queryHealthChargeList(healthChargeQuery); + String interpretDoctorName = ""; - if (StringUtils.isNotEmpty(currInterpretDoctorId)) { - Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId)); - if (users != null) { - interpretDoctorName = users.getName(); + if (CollectionUtils.isNotEmpty(list)) + { + // 报告解读医生 + String currInterpretDoctorId = list.get(0).getDoctorId(); + if (StringUtils.isNotEmpty(currInterpretDoctorId)) { + Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId)); + if (users != null) { + interpretDoctorName = users.getName(); + } } } + String settleStatusName = ""; if (currentSettleStatus != null) { settleStatusName = currentSettleStatus == 1 ? "未结算" : "已结算"; @@ -1094,6 +1099,27 @@ public class BabyNutritionFacade { healthChargeQuery.setCreatedStart(startTime); healthChargeQuery.setCreatedEnd(endTime); + if (request.getInterpretDoctorId() != null) { + healthChargeQuery.setDoctorId(request.getInterpretDoctorId()); + } + + List arrayList = new ArrayList(); + String findNo = request.getNumber(); + if (StringUtils.isNotEmpty(findNo)) { + List babyModels = getBabyModels(findNo, null); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel model : babyModels) { + String modelId = model.getId(); + arrayList.add(modelId); + } + } + } + + if (arrayList.size() > 0) { + healthChargeQuery.setIds(arrayList); + } + + ChargeRecordModel recordModel = new ChargeRecordModel(); recordModel.setStartDate(startTime); recordModel.setEndDate(endTime);