老人报表更新

server-common/src/main/java/com/makeit/module/system/service/impl/SysConfigServiceImpl.java

@@ -203,7 +203,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_NAME_DUPLICATE);
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_NAME_DUPLICATE);
             }
             }
 
 
-            if (old.getCode().equals(sysConfig.getCode()) && !old.getId().equals(sysConfig.getId())) {
+            if (StringUtils.isNotBlank(old.getCode()) && old.getCode().equals(sysConfig.getCode()) && !old.getId().equals(sysConfig.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_DICT_VALUE_DUPLICATE);
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_DICT_VALUE_DUPLICATE);
             }
             }
 
 

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

@@ -236,13 +236,21 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         List<PlatElderSleepDiagramWeekContentVO> sleep = StreamUtil.map(dateList, e -> {
         List<PlatElderSleepDiagramWeekContentVO> sleep = StreamUtil.map(dateList, e -> {
             PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();
             PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();
             vo.setDay(e);
             vo.setDay(e);
+
+//            List<PlatElderSleep> list =
+//
 //            vo.setSleepDeepDuration();
 //            vo.setSleepDeepDuration();
 //            vo.setSleepModerateDuration();
 //            vo.setSleepModerateDuration();
 //            vo.setSleepLightnessDuration();
 //            vo.setSleepLightnessDuration();
 //            vo.setSoberDuration();
 //            vo.setSoberDuration();
-//            vo.setTurnedCount();
-//            vo.setBodyMoveCount();
-//            vo.setScore();
+
+            PlatElderSleepAnalysis platElderSleepAnalysis = sleepAnalysisMap.get(dateTimeFormatter.format(e));
+
+            if (platElderSleepAnalysis != null) {
+                vo.setTurnedCount(platElderSleepAnalysis.getTurnedCount());
+                vo.setBodyMoveCount(platElderSleepAnalysis.getActionCount());
+                vo.setScore(Integer.valueOf(platElderSleepAnalysis.getSleepScore() + ""));
+            }
 
 
             return vo;
             return vo;