fix：修复bug

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

@@ -258,7 +258,6 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
 
 
     @Override
     @Override
     public List<PlatElderRealTimeHeartRespiratoryVO> heartRespiratory(PlatElderReportDTO platElderIdDTO) {
     public List<PlatElderRealTimeHeartRespiratoryVO> heartRespiratory(PlatElderReportDTO platElderIdDTO) {
-
         PlatDevice platDevice = platElderRealTimeService.getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         PlatDevice platDevice = platElderRealTimeService.getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 
 
         if (platDevice == null) {
         if (platDevice == null) {

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

@@ -103,6 +103,11 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
 
         if (StringUtils.isNotBlank(deviceId)) {
         if (StringUtils.isNotBlank(deviceId)) {
             platDevice = platDeviceService.getById(deviceId);
             platDevice = platDeviceService.getById(deviceId);
+            if (platDevice == null) {
+                platDevice = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
+                        .eq(PlatDevice::getOriDeviceId, deviceId).last("limit 1"));
+
+            }
         }
         }
 
 
         return platDevice;
         return platDevice;

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

@@ -94,7 +94,7 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport
 
 
         List<PlatElderReportMonth> monthList = list(new QueryWrapper<PlatElderReportMonth>().lambda()
         List<PlatElderReportMonth> monthList = list(new QueryWrapper<PlatElderReportMonth>().lambda()
                 .eq(StringUtils.isNotBlank(platElderIdDTO.getElderId()), PlatElderReportMonth::getElderId, platElderIdDTO.getElderId())
                 .eq(StringUtils.isNotBlank(platElderIdDTO.getElderId()), PlatElderReportMonth::getElderId, platElderIdDTO.getElderId())
-                .eq(StringUtils.isNotBlank(platElderIdDTO.getDeviceId()), PlatElderReportMonth::getBreatheDeviceId, platElderIdDTO.getDeviceId())
+                .eq(StringUtils.isNotBlank(platElderIdDTO.getDeviceId()), PlatElderReportMonth::getBreatheOriDeviceId, platElderIdDTO.getDeviceId())
                 .ge(PlatElderReportMonth::getDay, start)
                 .ge(PlatElderReportMonth::getDay, start)
                 .le(PlatElderReportMonth::getDay, end)
                 .le(PlatElderReportMonth::getDay, end)
                 .orderByAsc(PlatElderReportMonth::getDay)
                 .orderByAsc(PlatElderReportMonth::getDay)