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

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

@@ -763,13 +763,16 @@ public class PatientInfoPlatFormService {
            switch (categoryCode) {
                case 4:
                    deviceOnLineMap.put("deviceName",device_name);
                    if (detailInfo.get("wear_flagName").toString().equals("未佩戴")){
                    boolean wearFlagNameBoolean = detailInfo.containsKey("wear_flagName");
                    if (wearFlagNameBoolean&&detailInfo.get("wear_flagName").toString().equals("未佩戴")){
                        deviceStatus +=1;
                        deviceOnLineMap.put("deviceStatusCode",2);
                    }else {
                        deviceOnLineMap.put("deviceStatusCode",0);
                    }
                    deviceOnLineMap.put("deviceStatus",detailInfo.get("wear_flagName").toString());
                    if (wearFlagNameBoolean) {
                        deviceOnLineMap.put("deviceStatus",detailInfo.get("wear_flagName").toString());
                    }
                    //Map heartRate = detailInfo.get("heartRate").equals("暂无数据？")?(Map) detailInfo.get("heartRate"):new HashMap<>();
                   Map<String,Object> heartRate = !detailInfo.get("heartRate").equals("暂无数据？")?(Map) detailInfo.get("heartRate"): (Map)new HashMap(){{put("value1_status","暂无数据?");put("value1",0);}};
@@ -782,7 +785,10 @@ public class PatientInfoPlatFormService {
                        oldCheckInfoMap.put("heartStatus",heartRate.get("value1_status"));
                    }
                    oldCheckInfoMap.put("heart",heartRate.get("value1"));
                    oldCheckInfoMap.put("leaveHome",detailInfo.get("homeRange"));
                    if (!detailInfo.get("homeRange").equals("暂无数据？")) {
                        oldCheckInfoMap.put("leaveHome",detailInfo.get("homeRange"));
                    }
                    oldCheckInfoMap.put("address",location.get("address"));
                    if (!detailInfo.get("steps_status").equals("暂无数据？")||!steps.get("steps").equals(0)) {
                        oldCheckInfoMap.put("stepsStatus",detailInfo.get("steps_status"));
@@ -1089,7 +1095,7 @@ public class PatientInfoPlatFormService {
                            }else {
                                detailInfo.put("isAtHome",dict(dictList,"ty4"));
                            }
                            detailInfo.put("homeRange",homeDistance * 1000);
                            detailInfo.put("homeRange",Math.floor(homeDistance * 1000));
                        }else {
                            detailInfo.put("homeRange",zwsj);
                            detailInfo.put("isAtHome",zwsj);