Quellcode durchsuchen

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

liubing vor 2 Jahren
Ursprung
Commit
dd06f03aff

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

@ -776,7 +776,7 @@ 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;
                    if(!heartRate.get("value1_status").equals("暂无数据?")){
                    if(!heartRate.get("value1_status").equals("暂无数据?")){
                        oldCheckInfoMap.put("heartStatus",heartRate.get("value1_status"));
                    }
                    oldCheckInfoMap.put("heart",heartRate.get("value1"));
@ -1192,7 +1192,7 @@ public class PatientInfoPlatFormService {
                                Integer heartRate = response.getInteger("heartrate");
                                Integer breath = response.getInteger("breathrate");
                                Integer xlValue1 = Integer.parseInt(dict(dictList,"xlValue1"));
                                Integer xlValue2 = Integer.parseInt(dict(dictList,"xlValue1"));
                                Integer xlValue2 = Integer.parseInt(dict(dictList,"xlValue2"));
                                dictCode = "";
                                if (heartRate < xlValue1) {
                                    dictCode = "xl3";
@ -1210,7 +1210,7 @@ public class PatientInfoPlatFormService {
                                Integer hxValue2 = Integer.parseInt(dict(dictList,"hxValue2"));
                                if (breath > hxValue2) {
                                    dictCode = "hx1";
                                } else if (hxValue1 < 10) {
                                } else if (breath< hxValue1) {
                                    dictCode = "hx2";
                                } else if (breath >= hxValue1 && breath <= hxValue2) {
                                    dictCode = "zc1";
@ -1219,6 +1219,8 @@ public class PatientInfoPlatFormService {
                            } else {
                                detailInfo.put("bedStatus", dict(dictList,"yachuang2"));
                                detailInfo.put("heartRate", zwsj);
                                detailInfo.put("heartRate_status",zwsj);
                                detailInfo.put("breath_status",zwsj);
                                detailInfo.put("breath", zwsj);
                            }
                        }