fix:bug修改

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

@@ -33,10 +33,7 @@ import java.math.BigDecimal;
 import java.time.*;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Service
 @Service
@@ -265,7 +262,6 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         );
         );
 
 
         Map<Integer, Map<String, List<PlatElderSleep>>> sleepMap = sleepList.stream().collect(Collectors.groupingBy(PlatElderSleep::getElderSleepType, Collectors.groupingBy(PlatElderSleep::getHappenDate)));
         Map<Integer, Map<String, List<PlatElderSleep>>> sleepMap = sleepList.stream().collect(Collectors.groupingBy(PlatElderSleep::getElderSleepType, Collectors.groupingBy(PlatElderSleep::getHappenDate)));
-        Map<LocalDate, List<PlatElderSleep>> sleepGroupMap = sleepList.stream().collect(Collectors.groupingBy(f -> LocalDate.parse(f.getHappenDate(), dateTimeFormatter)));
 
 
         Map<String, PlatElderSleepAnalysis> sleepAnalysisMap = StreamUtil.toMapDep(sleepAnalysisList, PlatElderSleepAnalysis::getHappenDate);
         Map<String, PlatElderSleepAnalysis> sleepAnalysisMap = StreamUtil.toMapDep(sleepAnalysisList, PlatElderSleepAnalysis::getHappenDate);
         List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate);
         List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate);
@@ -275,7 +271,8 @@ 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 = Optional.ofNullable(sleepGroupMap.get(e)).orElse(new ArrayList<>());
+            Map<String, List<PlatElderSleep>> sleepListMap = Optional.ofNullable(sleepMap.get(SleepTypeEnum.SLEEP.getType())).orElse(new HashMap<>());
+            List<PlatElderSleep> list = Optional.ofNullable(sleepListMap.get(dateTimeFormatter.format(e))).orElse(new ArrayList<>());
 
 
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> i.getSleepRecord().stream()).collect(Collectors.toList());
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> i.getSleepRecord().stream()).collect(Collectors.toList());
 
 
@@ -286,8 +283,8 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         List<PlatElderSleepDiagramWeekContentVO> rest = StreamUtil.map(dateList, e -> {
         List<PlatElderSleepDiagramWeekContentVO> rest = StreamUtil.map(dateList, e -> {
             PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();
             PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();
             vo.setDay(e);
             vo.setDay(e);
-
-            List<PlatElderSleep> list = Optional.ofNullable(sleepMap.get(2)).map(i -> i.get(dateTimeFormatter.format(e))).orElse(new ArrayList<>(10));
+            Map<String, List<PlatElderSleep>> restListMap = Optional.ofNullable(sleepMap.get(SleepTypeEnum.RESTING.getType())).orElse(new HashMap<>());
+            List<PlatElderSleep> list = Optional.ofNullable(restListMap.get(dateTimeFormatter.format(e))).orElse(new ArrayList<>(10));
 
 
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> Optional.ofNullable(i.getSleepRecord()).orElse(new ArrayList<>(10)).stream()).collect(Collectors.toList());
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> Optional.ofNullable(i.getSleepRecord()).orElse(new ArrayList<>(10)).stream()).collect(Collectors.toList());