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

+ 0 - 2
nb-system/src/main/java/com/nb/bus/listener/DeviceInfoListener.java

@@ -5,7 +5,6 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.nb.bus.entity.*;
@@ -427,7 +426,6 @@ public class DeviceInfoListener {
                     device.setTotalAppendDose(appendDose.multiply(BigDecimal.valueOf(Optional.ofNullable(device.getPcaValidCount()).orElse(0))));
                 }
             }
-
         }
 
         cacheOperation.add(()->{

+ 2 - 4
nb-system/src/main/java/com/nb/bus/stats/analyse/PcaStatsAnalyse.java

@@ -88,13 +88,11 @@ public class PcaStatsAnalyse implements CommonHistoryStats {
      */
     private LineResult capitaLine(Map<String, List<CombineHistoryResult>> groupByTime) {
         LineResult<BigDecimal> result =LineResult.of("capital",false,false,"人均次数");
-        Map<String, List<CombineHistoryResult>> groupByTimeAndPatient=new HashMap<>();
+        Map<String, List<CombineHistoryResult>> groupByTimeAndPatient=new LinkedHashMap<>();
 
         //根据病号对输注进行划分
         groupByTime.forEach((k,histories)->{
-            if(CollectionUtil.isNotEmpty(histories)){
-                groupByTimeAndPatient.put(k, groupByClinic(histories));
-            }
+            groupByTimeAndPatient.put(k, groupByClinic(histories));
         });
 
         handleMixPolyLines(groupByTimeAndPatient,result,