fix:bug修复

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

@@ -91,10 +91,11 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
         return LocalDateTime.ofInstant(Instant.ofEpochMilli(longTime), ZoneOffset.of("+8"));
         return LocalDateTime.ofInstant(Instant.ofEpochMilli(longTime), ZoneOffset.of("+8"));
     }
     }
 
 
-    private PlatElderBreatheAnalysis elderHeartAnalysis (PlatElder platElder, Map<String, PlatElderBreatheDayStat> breatheDayStatMap,
-                                     LocalDateTime yesStart,SaasSleepAnalysisModel analysisModel,
-                                     SaasDiseaseModel saasDiseaseModel,
-                                     LocalDate yesDate,Map<String, PlatElderBreatheAnalysis> analysisMap) {
+    private PlatElderBreatheAnalysis elderHeartAnalysis(PlatElder platElder, Map<String, PlatElderBreatheDayStat> breatheDayStatMap,
+                                                        LocalDateTime yesStart, SaasSleepAnalysisModel analysisModel,
+                                                        SaasDiseaseModel saasDiseaseModel,
+                                                        LocalDate yesDate, Map<String, PlatElderBreatheAnalysis> analysisMap,
+                                                        SaasDiseaseEvaluateReport saasDiseaseEvaluateReport) {
         // 呼吸率
         // 呼吸率
         int breatheThresholdMin = Integer.parseInt(analysisModel.getBreatheThresholdMin());
         int breatheThresholdMin = Integer.parseInt(analysisModel.getBreatheThresholdMin());
         int breatheThresholdMax = Integer.parseInt(analysisModel.getBreatheThresholdMax());
         int breatheThresholdMax = Integer.parseInt(analysisModel.getBreatheThresholdMax());
@@ -318,9 +319,7 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
             hrSlowFlag = true;
             hrSlowFlag = true;
         }
         }
         normalFlag = !(hrFastFlag || brStopFlag || brFastFlag || brSlowFlag || hrSlowFlag);
         normalFlag = !(hrFastFlag || brStopFlag || brFastFlag || brSlowFlag || hrSlowFlag);
-        SaasDiseaseEvaluateReport saasDiseaseEvaluateReport = saasDiseaseEvaluateReportService.getOne(
-                new QueryWrapper<SaasDiseaseEvaluateReport>().lambda().orderByDesc(BaseEntity::getCreateBy)
-                        .last("limit 1"));
+
         List<DiseaseReportVO> evaluateReportList = JSON.parseArray(saasDiseaseEvaluateReport.getResultContent(), DiseaseReportVO.class);
         List<DiseaseReportVO> evaluateReportList = JSON.parseArray(saasDiseaseEvaluateReport.getResultContent(), DiseaseReportVO.class);
         DiseaseReportVO finalReport = new DiseaseReportVO();
         DiseaseReportVO finalReport = new DiseaseReportVO();
         // 根据疾病标准配置的规则判断满足哪个区间范围
         // 根据疾病标准配置的规则判断满足哪个区间范围
@@ -405,9 +404,8 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
 
 
         LocalDateTime yesStart = LocalDateTimeUtils.getDayStart(yesDate);
         LocalDateTime yesStart = LocalDateTimeUtils.getDayStart(yesDate);
         LocalDateTime yesEnd = LocalDateTimeUtils.getDayEnd(yesDate);
         LocalDateTime yesEnd = LocalDateTimeUtils.getDayEnd(yesDate);
-        List<String> elderIds = Lists.newArrayList("1739220917604581381");
         List<PlatElder> elderList = platElderService.list(new QueryWrapper<PlatElder>().lambda()
         List<PlatElder> elderList = platElderService.list(new QueryWrapper<PlatElder>().lambda()
-                .isNotNull(PlatElder::getBedId).like(PlatElder::getName, "呼吸测试"));
+                .isNotNull(PlatElder::getBedId));
         List<PlatElderBreatheAnalysis> result = new ArrayList<>();
         List<PlatElderBreatheAnalysis> result = new ArrayList<>();
         if (CollectionUtils.isEmpty(elderList)) {
         if (CollectionUtils.isEmpty(elderList)) {
             return result;
             return result;
@@ -432,9 +430,13 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
                 .in(PlatElderBreatheAnalysis::getElderId, elderIdList)
                 .in(PlatElderBreatheAnalysis::getElderId, elderIdList)
                 .eq(PlatElderBreatheAnalysis::getHappenDate, yesDate)), PlatElderBreatheAnalysis::getElderId);
                 .eq(PlatElderBreatheAnalysis::getHappenDate, yesDate)), PlatElderBreatheAnalysis::getElderId);
 
 
+        SaasDiseaseEvaluateReport saasDiseaseEvaluateReport = saasDiseaseEvaluateReportService.getOne(
+                new QueryWrapper<SaasDiseaseEvaluateReport>().lambda().orderByDesc(BaseEntity::getCreateBy)
+                        .last("limit 1"));
+
         for (PlatElder platElder : elderList) {
         for (PlatElder platElder : elderList) {
             PlatElderBreatheAnalysis platAnalysis = elderHeartAnalysis(platElder, breatheDayStatMap, yesStart, analysisModel,
             PlatElderBreatheAnalysis platAnalysis = elderHeartAnalysis(platElder, breatheDayStatMap, yesStart, analysisModel,
-                    saasDiseaseModel, yesDate, analysisMap);
+                    saasDiseaseModel, yesDate, analysisMap, saasDiseaseEvaluateReport);
             result.add(platAnalysis);
             result.add(platAnalysis);
         }
         }
         return result;
         return result;