Merge remote-tracking branch 'origin/master'

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

@@ -89,9 +89,17 @@ public class PinanbaoService {
             vo.setBreathRate(device.getBreathRate());
             vo.setHeartRate(device.getHeartRate());
 
-            //活动状态
-            vo.setMoveStatu(device.getMoveStatus());
-            vo.setMoveStatuName(DeviceMoveStateEnum.getCodeToName(device.getMoveStatus()));
+            //厕所场景下， 活动状态 只有 有人/无人
+            if (DeviceSceneEnum.TOILET.getValue().equals(device.getDevScene())){
+                vo.setMoveStatu(device.getMoveStatus());
+                String desc = DeviceMoveStateEnum.NONE.getValue().equals(device.getMoveStatus())?"无人":"有人";
+                vo.setMoveStatuName(desc);
+            }else{
+                //活动状态
+                vo.setMoveStatu(device.getMoveStatus());
+                vo.setMoveStatuName(DeviceMoveStateEnum.getCodeToName(device.getMoveStatus()));
+            }
+
 
             //在床状态
             vo.setInbedStatus(device.getInbedStatus());