修改 卧室场景：无人、在床冲突时的 逻辑

src/main/java/com/care/client/service/PinanbaoService.java

@@ -107,6 +107,14 @@ public class PinanbaoService {
             vo.setInbedStatus(device.getInbedStatus());
             vo.setInbedStatusName(DeviceInbedStateEnum.getCodeToName(device.getInbedStatus()));
 
+            //卧室场景： 在床、无人冲突时， 显示成 静止状态
+            if (DeviceSceneEnum.BEDROOM.getValue().equals(device.getDevScene())){
+                if (DeviceMoveStateEnum.NONE.getValue().equals(device.getMoveStatus()) && DeviceInbedStateEnum.INBED.getValue().equals(device.getInbedStatus())){
+                    vo.setMoveStatu(DeviceMoveStateEnum.STATIC.getValue());
+                    vo.setMoveStatuName(DeviceMoveStateEnum.getCodeToName(DeviceMoveStateEnum.STATIC.getValue()));
+                }
+            }
+
             //睡眠时间
             DeviceMonitorVO vo1 = careBedroomInbedDetailService.selectSleepTime(devId);
             if(vo1 != null) {