fix：告警列表

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -123,14 +123,16 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
     @Override
     @Override
     public PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
     public PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
         PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(WechatUserUtil.getUserId());
         PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(WechatUserUtil.getUserId());
+        List<PlatElderChildrenInfo> platElderChildrenInfoList = platElderChildrenInfoService.list(new QueryWrapper<PlatElderChildrenInfo>().lambda().eq(PlatElderChildrenInfo::getOpenid, platElderChildrenInfo)
+                .isNotNull(PlatElderChildrenInfo::getElderId));
         log.info("子女端账号："+platElderChildrenInfo.toString());
         log.info("子女端账号："+platElderChildrenInfo.toString());
         String elderId = platElderChildrenInfo.getElderId();
         String elderId = platElderChildrenInfo.getElderId();
-        if(StringUtils.isBlank(elderId)){
+        if(CollectionUtils.isNotEmpty(platElderChildrenInfoList)){
             return new PageVO<>();
             return new PageVO<>();
         }
         }
-        String[] split = elderId.split(",");
+        List<String> elderIdList = platElderChildrenInfoList.stream().map(PlatElderChildrenInfo::getElderId).collect(Collectors.toList());
         PlatAlarmRecordQueryDTO data = dto.getData();
         PlatAlarmRecordQueryDTO data = dto.getData();
-        data.setElderIdList(Arrays.asList(split));
+        data.setElderIdList(elderIdList);
         data.setNoticeStatus(CommonEnum.YES.getValue());
         data.setNoticeStatus(CommonEnum.YES.getValue());
         return page(dto);
         return page(dto);
     }
     }

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java

@@ -206,6 +206,9 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         platElderSleepEvaluationVO.setScore(score);
         platElderSleepEvaluationVO.setScore(score);
         platElderSleepEvaluationVO.setSleepDuration(sleepDuration);
         platElderSleepEvaluationVO.setSleepDuration(sleepDuration);
         platElderSleepEvaluationVO.setRestDuration(restDuration);
         platElderSleepEvaluationVO.setRestDuration(restDuration);
+        platElderSleepEvaluationVO.setSleepDurationHour(new BigDecimal(platElderSleepEvaluationVO.getSleepDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+        platElderSleepEvaluationVO.setRestDurationHour(new BigDecimal(platElderSleepEvaluationVO.getRestDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+
 
 
         EvaluateReportVO evaluateReportVO = saasSleepEvaluateReportService.getByScore(platElderSleepEvaluationVO.getScore());
         EvaluateReportVO evaluateReportVO = saasSleepEvaluateReportService.getByScore(platElderSleepEvaluationVO.getScore());
         if (evaluateReportVO != null) {
         if (evaluateReportVO != null) {