fix: 状态bug

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

@@ -223,7 +223,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             }
         } else {
             log.info("当前呼吸设备没有上报数据直接返回：" + platElderIdDTO.getElderId());
-            brNoPersonFlag = true;
             return platElderRealTimeNowVO;
         }
         List<PlatDevice> spaceDeviceList = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
@@ -330,16 +329,16 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                 sportFlag = false;
             }
         }
-        if (!sportFlag) {
-            log.info("当前属于离床静息：" + platElderIdDTO.getElderId());
-            platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue());
-            return platElderRealTimeNowVO;
-        }
         if (brNoPersonFlag && spaceNoPersonFlag && fallNoPersonFlag) {
             log.info("所有设备都无人，判断为外出：" + platElderIdDTO.getElderId());
             platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
             return platElderRealTimeNowVO;
         }
+        if (!sportFlag) {
+            log.info("当前属于离床静息：" + platElderIdDTO.getElderId());
+            platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue());
+            return platElderRealTimeNowVO;
+        }
 
         log.info("当前设备无状态匹配直接返回：" + platElderIdDTO.getElderId());
         return platElderRealTimeNowVO;