fix 修复一些bug

nb-system/src/main/java/com/nb/bus/entity/BusEvaluationEntity.java

@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 
 /**
  * <p>
@@ -48,49 +48,79 @@ public class BusEvaluationEntity extends TenantGenericEntity<String,String> {
     @Length(max = 50,message = "泵号长度不得超过50个字节")
     private String deviceId;
 
-    @ApiModelProperty(value = "疼痛评分静止")
+    @ApiModelProperty(value = "疼痛静止评分")
+    @Max(value = 1000,message = "疼痛静止评分不得大于1000")
+    @Min(value = 0,message = "疼痛静止评分不得低于0")
     private Integer statics;
 
-    @ApiModelProperty(value = "疼痛评分活动")
+    @ApiModelProperty(value = "疼痛活动评分")
+    @Max(value = 1000,message = "疼痛活动评分不得大于1000")
+    @Min(value = 0,message = "疼痛活动评分不得小于1000")
     private Integer activity;
 
     @ApiModelProperty(value = "镇静评分")
+    @Max(value = 1000,message = "镇静评分不得大于1000")
+    @Min(value = 0,message = "镇静评分不得小于0")
     private Integer calm;
 
     @ApiModelProperty(value = "左上肢")
+    @Max(value = 1000,message = "左上肢评分不得大于1000")
+    @Min(value = 0,message = "左上肢评分不得小于0")
     private Integer leftArm;
 
     @ApiModelProperty(value = "左下肢")
+    @Max(value = 1000,message = "左下肢评分不得大于1000")
+    @Min(value = 0,message = "左下肢评分不得小于0")
     private Integer leftLeg;
 
     @ApiModelProperty(value = "右上肢")
+    @Max(value = 1000,message = "右上肢评分不得大于1000")
+    @Min(value = 0,message = "右上肢评分不得小于0")
     private Integer rightArm;
 
     @ApiModelProperty(value = "右下肢")
+    @Max(value = 1000,message = "右下肢评分不得大于1000")
+    @Min(value = 0,message = "右下肢评分不得小于0")
     private Integer rightLeg;
 
     @ApiModelProperty(value = "恶心呕吐")
+    @Max(value = 1000,message = "恶心呕吐评分不得大于1000")
+    @Min(value = 0,message = "恶心呕吐评分不得小于0")
     private Integer nauseaVomit;
 
     @ApiModelProperty(value = "瘙痒")
+    @Max(value = 1000,message = "瘙痒评分不得大于1000")
+    @Min(value = 0,message = "瘙痒评分不得小于0")
     private Integer itch;
 
     @ApiModelProperty(value = "眩晕")
+    @Max(value = 1000,message = "眩晕评分不得大于1000")
+    @Min(value = 0,message = "眩晕评分不得小于0")
     private Integer vertigo;
 
     @ApiModelProperty(value = "咽喉疼痛")
+    @Max(value = 1000,message = "咽喉疼痛评分不得大于1000")
+    @Min(value = 0,message = "咽喉疼痛评分不得小于0")
     private Integer soreThroat;
 
     @ApiModelProperty(value = "尿潴留")
+    @Max(value = 1000,message = "尿潴留评分不得大于1000")
+    @Min(value = 0,message = "尿潴留评分不得小于0")
     private Integer uroschesis;
 
     @ApiModelProperty(value = "呼吸抑制")
+    @Max(value = 1000,message = "呼吸抑制评分不得大于1000")
+    @Min(value = 0,message = "呼吸抑制评分不得小于0")
     private Integer breathDepression;
 
     @ApiModelProperty(value = "声音嘶哑")
+    @Max(value = 1000,message = "声音嘶哑评分不得大于1000")
+    @Min(value = 0,message = "声音嘶哑评分不得小于0")
     private Integer hoarseness;
 
     @ApiModelProperty(value = "认知障碍")
+    @Max(value = 1000,message = "认知障碍评分不得大于1000")
+    @Min(value = 0,message = "认知障碍评分不得小于0")
     private Integer cognitionObstacle;
 
     @ApiModelProperty(value = "其他")
@@ -98,6 +128,8 @@ public class BusEvaluationEntity extends TenantGenericEntity<String,String> {
     private String other;
 
     @ApiModelProperty(value = "满意度")
+    @Max(value = 1000,message = "满意度评分不得大于1000")
+    @Min(value = 0,message = "满意度评分不得小于0")
     private Integer satisfaction;
 
 
@@ -111,21 +143,33 @@ public class BusEvaluationEntity extends TenantGenericEntity<String,String> {
     private String evaluator;
 
     @ApiModelProperty(value = "收缩压")
+    @DecimalMax(value = "10000",message = "收缩压最大值不得超过10000")
+    @DecimalMin(value = "-100",message ="收缩压最小值不得低于-100" )
     private BigDecimal  shrinkPressure;
 
 
     @ApiModelProperty(value = "舒张压")
+    @DecimalMax(value = "10000",message = "舒张压最大值不得超过10000")
+    @DecimalMin(value = "-100",message ="舒张压最小值不得低于-100" )
     private BigDecimal diastensPressure;
 
     @ApiModelProperty(value = "心率")
+    @DecimalMax(value = "10000",message = "心率最大值不得超过10000")
+    @DecimalMin(value = "-100",message ="心率最小值不得低于-100" )
     private BigDecimal heartRate;
 
     @ApiModelProperty(value = "胎心")
+    @DecimalMax(value = "10000",message = "胎心最大值不得超过10000")
+    @DecimalMin(value = "-100",message ="胎心最小值不得低于-100" )
     private BigDecimal fetalHeartRate;
 
     @ApiModelProperty(value = "呼吸频率")
+    @DecimalMax(value = "10000",message = "呼吸频率最大值不得超过10000")
+    @DecimalMin(value = "-100",message ="呼吸频率最小值不得低于-100" )
     private BigDecimal breathRate;
 
     @ApiModelProperty(value = "血氧饱和度")
+    @DecimalMax(value = "10000",message = "血氧饱和度最大值不得超过10000")
+    @DecimalMin(value = "-100",message ="血氧饱和度最小值不得低于-100" )
     private BigDecimal bloodOxygenSaturation;
 }

nb-system/src/main/java/com/nb/bus/entity/common/DeviceProperties.java

@@ -66,17 +66,17 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
 
     @ApiModelProperty(value = "公共参数-追加量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
+    @DecimalMin(value = "0",message ="PCA追加量最小值不得低于0" )
     private BigDecimal appendDose;
 
     @ApiModelProperty(value = "公共参数-追加锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
-    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过0" )
+    @DecimalMin(value = "1",message ="PCA追加量最小值不得低于0" )
     private BigDecimal appendLockTime;
 
     @ApiModelProperty(value = "公共参数-极限量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
-    @DecimalMin(value = "0",message ="PCA追加量最小值不得超过0" )
+    @DecimalMin(value = "0",message ="PCA追加量最小值不得低于0" )
     private BigDecimal maxDose;
 
     @ApiModelProperty(value = "公共参数-自控锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
@@ -96,52 +96,52 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
 
     @ApiModelProperty(value = "持续泵参数-持续量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
-    @DecimalMin(value = "0",message ="持续给液量最小值不得超过0" )
+    @DecimalMin(value = "0",message ="持续给液量最小值不得低于0" )
     private BigDecimal continueDose;
 
     @ApiModelProperty(value = "脉冲泵参数-脉冲量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @Max(value = 20,message = "脉冲量最大值不得超过20")
-    @Min(value = 0,message ="脉冲量最小值不得超过0" )
+    @Min(value = 0,message ="脉冲量最小值不得低于0" )
     private Integer pulseDose;
 
     @ApiModelProperty(value = "脉冲泵参数-脉冲锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @Max(value = 90,message = "脉冲锁时最大值不得超过90")
-    @Min(value = 30,message ="脉冲锁时最小值不得超过30" )
+    @Min(value = 30,message ="脉冲锁时最小值不得低于30" )
     private Integer pulseLockTime;
 
     @ApiModelProperty(value = "脉冲泵参数-脉冲首次锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @Max(value = 60,message = "脉冲首次锁时最大值不得超过60")
-    @Min(value = 0,message ="脉冲首次锁时最小值不得超过0" )
+    @Min(value = 0,message ="脉冲首次锁时最小值不得低于0" )
     private Integer pulseFirstLockTime;
 
     @ApiModelProperty(value = "智能泵参数-加档周期",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "10",message = "加档周期最大值不得超过10")
-    @DecimalMin(value = "0.5",message ="加档周期最小值不得超过0.5" )
+    @DecimalMin(value = "0.5",message ="加档周期最小值不得低于0.5" )
     private BigDecimal flowUpCycle;
 
     @ApiModelProperty(value = "智能泵参数-减档周期",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "10",message = "减档周期最大值不得超过10")
-    @DecimalMin(value = "0.5",message ="减档周期最小值不得超过0.5" )
+    @DecimalMin(value = "0.5",message ="减档周期最小值不得低于0.5" )
     private BigDecimal flowDownCycle;
 
     @ApiModelProperty(value = "智能泵参数-计次",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
-    @DecimalMin(value = "1",message ="PCA追加量最小值不得超过1" )
+    @DecimalMin(value = "1",message ="PCA追加量最小值不得低于1" )
     private BigDecimal flowCount;
 
     @ApiModelProperty(value = "智能泵参数-上限",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "50",message = "智能泵上限值最大值不得超过90")
-    @DecimalMin(value = "1",message ="智能泵上限值最小值不得超过0" )
+    @DecimalMin(value = "1",message ="智能泵上限值最小值不得低于0" )
     private BigDecimal flowUpLimit;
 
     @ApiModelProperty(value = "智能泵参数-下限",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "50",message = "智能泵下限值最大值不得超过50")
-    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得超过0.1" )
+    @DecimalMin(value = "0.1",message ="智能泵下限值最小值不得低于0.1" )
     private BigDecimal flowDownLimit;
 
     @ApiModelProperty(value = "智能泵参数-自调比例",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @DecimalMax(value = "95",message = "自调比例不得超过95")
-    @DecimalMin(value = "0",message ="自调比例最小值不得超过0" )
+    @DecimalMin(value = "0",message ="自调比例最小值不得低于0" )
     private BigDecimal flowAdjustRate;
 
     @ApiModelProperty(value = "公共参数-电量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)

nb-system/src/main/java/com/nb/bus/service/dto/CombineQuery.java

@@ -1,5 +1,6 @@
 package com.nb.bus.service.dto;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.bus.enums.StatsTimeUnit;
@@ -221,6 +222,13 @@ public class CombineQuery {
         }
     }
 
+    public List<String> getOrderByDesc() {
+        if(CollUtil.isEmpty(orderByAsc)&&CollUtil.isEmpty(orderByDesc)){
+            orderByDesc.add("clinic_id");
+        }
+        return orderByDesc;
+    }
+
     /**
      * 将前端的提醒查询做统一封装，做请求处理
      * @param warns

nb-system/src/main/java/com/nb/bus/stats/analyse/AlarmStatsAnalyse.java

@@ -77,7 +77,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
         AlarmScatter alarmScatter = new AlarmScatter();
         groupByTime.forEach((timeRange,combineResults)->{
             for (CombineAlarmResult combineResult : combineResults) {
-                alarmScatter.handle(combineResult,timeRange);
+                alarmScatter.handle(combineResult,timeRange,addIntelligentParam());
             }
             alarmScatter.fillAllAlarm(timeRange,addIntelligentParam());
         });

nb-system/src/main/java/com/nb/bus/stats/entity/AlarmScatter.java

@@ -168,7 +168,7 @@ public class AlarmScatter extends LinkedHashMap<String, Map<String, AlarmScatter
 
 
 
-    public void handle(CombineAlarmResult alarmResult,String time) {
+    public void handle(CombineAlarmResult alarmResult,String time,boolean intelligent) {
         if (Boolean.TRUE.equals(alarmResult.getIsAlarm())) {
             DeviceAlarmEnum alarm = alarmResult.getAlarm();
             switch (alarm){
@@ -207,26 +207,29 @@ public class AlarmScatter extends LinkedHashMap<String, Map<String, AlarmScatter
             if (DeviceStatusEnum.NoSignal.equals(runState)) {
                 incrementNoSignal(time);
             }
-            FlowStatusEnum warnFlow = alarmResult.getWarnFlow();
-            if(warnFlow!=null){
-                switch (warnFlow){
-                    case Up:
-                        incrementFlowUp(time);
-                        break;
-                    case Down:
-                        incrementFlowDown(time);
-                        break;
-                    case Lowest:
-                        incrementLowInfusion(time);
-                        break;
-                    case Limited:
-                        incrementFlowLimited(time);
-                        break;
-                    case MaxFlow:
-                        incrementFlowMax(time);
-                    default:break;
+            if(intelligent){
+                FlowStatusEnum warnFlow = alarmResult.getWarnFlow();
+                if(warnFlow!=null){
+                    switch (warnFlow){
+                        case Up:
+                            incrementFlowUp(time);
+                            break;
+                        case Down:
+                            incrementFlowDown(time);
+                            break;
+                        case Lowest:
+                            incrementLowInfusion(time);
+                            break;
+                        case Limited:
+                            incrementFlowLimited(time);
+                            break;
+                        case MaxFlow:
+                            incrementFlowMax(time);
+                        default:break;
+                    }
                 }
             }
+
         }
     }