fix:bug修改

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

@@ -37,7 +37,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Service
 @Service
@@ -266,10 +265,9 @@ 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 = sleepAnalysisList.stream().collect(Collectors.toMap(PlatElderSleepAnalysis::getHappenDate, Function.identity(),(v1,v2)->v1));
-        // Map<String, PlatElderSleepAnalysis> sleepAnalysisMap = StreamUtil.toMap(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);
 
 
         DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
@@ -277,8 +275,7 @@ 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(sleepMap.get(1)).map(i -> i.get(dateTimeFormatter.format(e))).orElse(new ArrayList<>(10));
+            List<PlatElderSleep> list = Optional.ofNullable(sleepGroupMap.get(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());