老人图表bug

db/sys.sql

@@ -68,7 +68,7 @@ INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_i
 VALUES ('102', 'elder.realtime.now.status.rest', '静息', '30', 30, '', '100', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
 VALUES ('102', 'elder.realtime.now.status.rest', '静息', '30', 30, '', '100', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
 
 
 INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
 INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
-VALUES ('103', 'elder.realtime.now.status.bed', '静息', '40', 40, '', '100', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
+VALUES ('103', 'elder.realtime.now.status.bed', '在床', '40', 40, '', '100', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
 
 
 INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
 INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
 VALUES ('104', 'elder.realtime.now.status.sleep', '睡眠', '50', 50, '', '100', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
 VALUES ('104', 'elder.realtime.now.status.sleep', '睡眠', '50', 50, '', '100', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');

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

@@ -317,6 +317,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
 
         List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
         List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
+                .eq(PlatElderBreatheAnalysis::getElderId, platElderIdDTO.getElderId())
                 .ge(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
                 .ge(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
                 .le(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
                 .le(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
         );
         );