Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -776,7 +776,9 @@ public class PatientInfoPlatFormService {
                    Map steps = !detailInfo.get("steps").equals(0)?(Map)detailInfo.get("steps"):new HashMap(){{put("steps",0);}};
                    if (!heartRate.get("value1_status").equals("正常")) oldIndex+=1;
                    oldCheckInfoMap.put("heartStatus",heartRate.get("value1_status"));
                    if(!heartRate.get("value1_status").equals("暂无数据？")){
                        oldCheckInfoMap.put("heartStatus",heartRate.get("value1_status"));
                    }
                    oldCheckInfoMap.put("heart",heartRate.get("value1"));
                    oldCheckInfoMap.put("leaveHome",detailInfo.get("homeRange"));
                    oldCheckInfoMap.put("address",location.get("address"));
@@ -807,9 +809,7 @@ public class PatientInfoPlatFormService {
                    deviceOnLineMap.put("deviceStatus",online);
                    if (!detailInfo.get("breath_status").equals("正常"))oldIndex+=1;
                    oldCheckInfoMap.put("breath",detailInfo.get("breath"));
                    if (!detailInfo.get("bedStatus").equals("暂无数据？")) {
                        oldCheckInfoMap.put("bedStatus",detailInfo.get("bedStatus"));
                    }
                    oldCheckInfoMap.put("bedStatus",detailInfo.get("bedStatus"));
                    if(!detailInfo.get("breath_status").equals("暂无数据？")){
                        oldCheckInfoMap.put("breathStatus",detailInfo.get("breath_status"));
                    }