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 5775b79..2ffdaa1 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 @@ -194,6 +194,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga @Override public BaseResponse info(String parentId, Integer type, Date time) { List> tabList = new ArrayList<>(); + List diabetesList = new ArrayList<>(); List betweenDay = DateUtil.getBetweenDay(time, 7); Object[] xAxis = betweenDay.toArray(); CollectionUtils.reverseArray(xAxis); @@ -243,7 +244,20 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga tabList.add(temp); } } - return RespBuilder.buildSuccess("tabList", tabList, "xAxis", xAxis, "minAxis", minAxis, "maxAxis", maxAxis, "bloodSugarAxis", bloodSugarAxis); + List recordModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(mongoUtil.getPid(parentId))), DiabetesRecordModel + .class); + if (CollectionUtils.isNotEmpty(recordModels)) + { + for(DiabetesRecordModel model : recordModels) + { + DiabetesRecordResult result = new DiabetesRecordResult(); + org.springframework.beans.BeanUtils.copyProperties(model, result); + result.setCreatedStr(DateUtil.getyyyy_MM_dd(model.getCreated())); + diabetesList.add(result); + } + } + + return RespBuilder.buildSuccess("tabList", tabList, "xAxis", xAxis, "minAxis", minAxis, "maxAxis", maxAxis, "bloodSugarAxis", bloodSugarAxis,"diabetesList",diabetesList); } @Override