Browse Source

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

chinawu123 2 years ago
parent
commit
4709379e4c

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

@ -806,9 +806,13 @@ public class PatientInfoPlatFormService {
                    deviceOnLineMap.put("deviceName",device_name);
                    deviceOnLineMap.put("deviceStatus",online);
                    if (!detailInfo.get("breath_status").equals("正常"))oldIndex+=1;
                    oldCheckInfoMap.put("breathStatus",detailInfo.get("breath_status"));
                    oldCheckInfoMap.put("breath",detailInfo.get("breath"));
                    oldCheckInfoMap.put("bedStatus",detailInfo.get("bedStatus"));
                    if (!detailInfo.get("bedStatus").equals("暂无数据?")) {
                        oldCheckInfoMap.put("bedStatus",detailInfo.get("bedStatus"));
                    }
                    if(!detailInfo.get("breath_status").equals("暂无数据?")){
                        oldCheckInfoMap.put("breathStatus",detailInfo.get("breath_status"));
                    }
                    break;
                case 14:
                    deviceOnLineMap.put("deviceName",device_name);
@ -1043,13 +1047,13 @@ public class PatientInfoPlatFormService {
                if (sqlResult.size()>0){
                    Integer xl = Integer.parseInt(sqlResult.get(0).get("value1").toString());
                    Integer xlValue1 = Integer.parseInt(dict(dictList,"xlValue1"));
                    Integer xlValue2 = Integer.parseInt(dict(dictList,"xlValue1"));
                    Integer xlValue2 = Integer.parseInt(dict(dictList,"xlValue2"));
                    if (xl>=xlValue1&&xl<=xlValue2) {
                        dictCode= "zc1";
                    }else if (xl<xlValue1){
                        dictCode="xl2";
                    }else if (xl>xlValue2){
                        dictCode="xl3";
                    }else if (xl>xlValue2){
                        dictCode="xl2";
                    }
                    sqlResult.get(0).put("value1_status",dict(dictList,dictCode));
                    detailInfo.put("heartRate",sqlResult.get(0));
@ -1190,11 +1194,11 @@ public class PatientInfoPlatFormService {
                                Integer xlValue1 = Integer.parseInt(dict(dictList,"xlValue1"));
                                Integer xlValue2 = Integer.parseInt(dict(dictList,"xlValue1"));
                                dictCode = "";
                                if (heartRate > 100) {
                                if (heartRate < xlValue1) {
                                    dictCode = "xl3";
                                } else if (heartRate < 50) {
                                } else if (heartRate > xlValue2) {
                                    dictCode = "xl2";
                                } else if (heartRate >= 50 && heartRate <= 100) {
                                } else if (heartRate >= xlValue1 && heartRate <= xlValue2) {
                                    dictCode = "zc1";
                                }