Просмотр исходного кода

fix 镇痛不足不从设备接收,平台自行判断

A17404李放 3 лет назад
Родитель
Сommit
9afa448e1c

+ 2 - 2
nb-system/src/main/java/com/nb/bus/entity/BusDeviceRunningEntity.java

@@ -180,8 +180,8 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
         this.setRunState(DeviceRunStatusUtils.getRunStatus(items.getInteger(PumpParams.runStatus)));
         this.setAlarm(DeviceAlarmUtils.getAlarm(Optional.ofNullable(items.getInteger(PumpParams.alarmStatus)).orElse(0)));
         // 预报
-        // 镇痛不足预报
-        this.setWarnAnalgesicPoor(Optional.ofNullable(items.getBoolean(PumpParams.warnAnalgesicPoor)).orElse(false));
+        // 镇痛不足预报 此报警不从设备接收
+//        this.setWarnAnalgesicPoor(Optional.ofNullable(items.getBoolean(PumpParams.warnAnalgesicPoor)).orElse(false));
         // 电量偏低预报
         this.setWarnLowBattery(Optional.ofNullable(items.getBoolean(PumpParams.warnLowBattery)).orElse(false));
         // 输液将结束预报

+ 1 - 0
nb-system/src/main/java/com/nb/bus/entity/common/CommonDeviceParam.java

@@ -108,6 +108,7 @@ public class CommonDeviceParam<K,T>  extends DeviceProperties<K,T>  {
 
     public String getWarns() {
         handleWarn();
+        //去除多余符号
         if (StrUtil.isNotEmpty(warns)) {
             return warns.endsWith(";")&&warns.length()>2?warns.substring(0,warns.length()-1):warns;
         }

+ 1 - 1
nb-system/src/main/java/com/nb/bus/stats/report/AnalStatsAnalyse.java

@@ -145,7 +145,7 @@ public class AnalStatsAnalyse implements CommonStats<CombineResult> {
                 .peek(result -> {
                     //将空的镇痛方式置为其他
                     if (StrUtil.isNullOrUndefined(result.getAnalType())) {
-                        result.setAnalType("其他");
+                        result.setAnalType("未填写");
                     }
                 })
                 .collect(Collectors.groupingBy(CombineResult::getAnalType,Collectors.counting()));