fix 自动结束管理

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

@@ -3,6 +3,7 @@ package com.nb.bus.stats.analyse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.nb.bus.enums.*;
 import com.nb.bus.service.LocalBusInfusionHistoryService;
 import com.nb.bus.service.dto.CombineAlarmResult;
@@ -54,7 +55,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
     public List<LineResult> handleLine(List<CombineAlarmResult> sources, StatsTimeUnit unit,Date minTime,Date maxTime) {
         //根据报警时间对结果进行区分统计
         Map<String, List<CombineAlarmResult>> groupByTime = groupByTime(sources, unit,minTime,maxTime,
-                t->true,
+                t-> ObjectUtil.isNotNull(t.getAlarmTime()),
                 CombineAlarmResult::getAlarmTime,
                 t->CollectionUtil.newHashSet(unit.parse(t.getAlarmTime())));
         List<LineResult> result = new ArrayList<>();
@@ -176,7 +177,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
     private LineResult countLine(Map<String, List<CombineAlarmResult>> sources) {
         LineResult<Long> result = LineResult.of("count",false,false,"提示次数分布图");
         List<String> time = result.getTime();
-        Map<String, AlarmTotalPieResult> groupByTime = new HashMap<>();
+        Map<String, AlarmTotalPieResult> groupByTime = new LinkedHashMap<>();
         //根据时间区间对镇痛方式进行统计
         sources.forEach((timeRange,combineResults)->{
             AlarmTotalPieResult alarmTotalPieResult = groupByTime.computeIfAbsent(timeRange, k -> new AlarmTotalPieResult(addIntelligentParam()));
@@ -219,7 +220,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
         TableResult result = new TableResult();
         //根据时间对结果进行区分统计
         Map<String, List<CombineAlarmResult>> groupByTimeResults = groupByTime(sources, unit,minTime,maxTime,
-                t->true,
+                t->ObjectUtil.isNotNull(t.getAlarmTime()),
                 CombineAlarmResult::getAlarmTime,
                 t->CollectionUtil.newHashSet(unit.parse(t.getAlarmTime())));
         List<String> columnNames = Arrays.asList(

nb-system/src/main/resources/mapper/bus/BusInfusionHistoryMapper.xml

@@ -269,7 +269,7 @@
         <include refid="commonClinicQuery"/>
         ) as c
         on i.clinic_id=c.id
-        JOIN(
+        left JOIN(
         <include refid="commonDeviceAlarmQuery"/>
         ) as a
         on a.infusion_id = i.id