add 默认排序

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

@@ -223,7 +223,16 @@ public class CombineQuery {
     }
 
     public List<String> getOrderByDesc() {
-        if(CollUtil.isEmpty(orderByAsc)&&CollUtil.isEmpty(orderByDesc)){
+        //添加默认排序
+        if(CollUtil.isEmpty(orderByAsc)
+                &&
+                CollUtil.isEmpty(orderByDesc)){
+            orderByDesc.add("clinic_id");
+        }
+        if(infusionFinishedDesc!=null&&
+                CollUtil.size(orderByAsc)==1
+                ||CollUtil.size(orderByDesc)==1){
+            //添加默认排序，否则顺序混乱
             orderByDesc.add("clinic_id");
         }
         return orderByDesc;

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

@@ -158,7 +158,7 @@ public class AlarmScatter extends LinkedHashMap<String, Map<String, AlarmScatter
     }
 
     public void incrementInfusionMax(String time) {
-        incrementValue(this.getLowInfusion(time));
+        incrementValue(this.getInfusionMax(time));
     }