diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 3ecabed..50e435b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -1266,10 +1266,29 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } data.put("weekRange",weekRange); - BloodSugar bloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("id").is(lsbId)), BloodSugar.class); + // 添加报告解读人 + List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(patientId).and("created").gt(DateUtil.getYMDTime())), BloodSugar.class); + List dateList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(bloodSugars)){ + for (BloodSugar sugar: bloodSugars){ + Date created = sugar.getCreated(); + if (created != null){ + String dbCreated = DateUtil.getyyyy_MM_dd(created); + String currentDate = DateUtil.getyyyy_MM_dd(new Date()); + if (dbCreated.equals(currentDate)){ + dateList.add(created); + } + } + } + } String doctorId = ""; - if (bloodSugar != null){ - doctorId = bloodSugar.getDoctorId(); + if (CollectionUtils.isNotEmpty(dateList)){ + Date maxDate = Collections.max(dateList); + List sugarList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patientId).and("created").is(maxDate)), BloodSugar.class); + if (CollectionUtils.isNotEmpty(sugarList)){ + BloodSugar bloodSugar = sugarList.get(0); + doctorId = bloodSugar.getDoctorId(); + } } healthChargeFacade.addHealthCharge(hospitalId, 2, patientId, 1, 1, userId, doctorId, false);