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 968ef75..c396a70 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 @@ -1595,12 +1595,53 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga @Override public BaseResponse getDoctorWx(String patientId) { + + + Patients pat = patientsService.findOnePatientById(patientId); + + List recordModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(pat.getPid())), DiabetesRecordModel + .class); + List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(pat.getPid()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class); - List> restList = new ArrayList<>(); + List> restList = new LinkedList<>(); if(CollectionUtils.isNotEmpty(bloodSugars)) { for (BloodSugar bloodSugar : bloodSugars) { Map temp = new HashMap<>(); + String content = ""; + if (CollectionUtils.isNotEmpty(recordModels)) + { + for (DiabetesRecordModel diabetesRecordModel : recordModels) + { + if (bloodSugar.getCreatYmdDate() != null && bloodSugar.getCreatYmdDate().equals(DateUtil.getyyyy_MM_dd(diabetesRecordModel.getCreated())) ) + { + switch (bloodSugar.getBloodSugarType()) + { + //A(1, "空腹"), C(3, "早餐后"), D(4, "午餐前"), E(5, "午餐后"), F(6, "晚餐前"), G(7, "晚餐后") + case 1: + content = diabetesRecordModel.getBreakfast(); + break; + case 3: + content = diabetesRecordModel.getBreakfastAdd(); + break; + case 4: + content = diabetesRecordModel.getLunch(); + break; + case 5: + content = diabetesRecordModel.getLunchAdd(); + break; + case 6: + content = diabetesRecordModel.getDinner(); + break; + case 7: + content = diabetesRecordModel.getDinnerAdd(); + break; + } + } + } + + } + temp.put("content", content); temp.put("createTime", bloodSugar.getCreatYmdDate()); temp.put("bloodSugar", bloodSugar.getBloodSugar()); temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType()));