fix 输注总数统计

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

@@ -250,7 +250,7 @@ public class EvalStatsAnalyse implements CommonStats<CombineEvalResult> {
             //表格内容
             LinkedHashMap<String, Object> contentValues = new LinkedHashMap<>();
             contentValues.put("时间",timeRange);
-            contentValues.put("输注次数",totalCount);
+            contentValues.put("输注总数",combineResult.stream().map(CombineEvalResult::getId).distinct().count());
             contentValues.put("评价次数",evalCount);
             contentValues.put("评价比率",computeRatio(evalCount,totalCount));
             //获取特定时间区间内
@@ -267,7 +267,7 @@ public class EvalStatsAnalyse implements CommonStats<CombineEvalResult> {
     private List<StatsColumn> getAllColumn(FunctionEvalConfig config) {
         List<StatsColumn> result = new ArrayList<>();
         result.add(StatsColumn.of("时间","时间"));
-        result.add(StatsColumn.of("输注次数","输注次数"));
+        result.add(StatsColumn.of("输注总数","输注总数"));
         result.add(StatsColumn.of("评价次数","评价次数"));
         result.add(StatsColumn.of("评价","评价",true));
         if(Boolean.TRUE.equals(config.getStatics())){

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

@@ -193,7 +193,8 @@ public class PcaStatsAnalyse implements CommonHistoryStats {
                 pcaInvalidTotalCount=pcaInvalidTotalCount+invalidCount;
                 total=total+validCount+invalidCount;
             }
-            contentValues.put("输注总数", CollectionUtil.size(combineResults));
+
+            contentValues.put("输注总数",combineResults.stream().map(CombineHistoryResult::getId).distinct().count());
             contentValues.put("自控总数",total);
             contentValues.put("自控有效数",pcaValidTotalCount);
             contentValues.put("自控无效数",pcaInvalidTotalCount);

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

@@ -277,7 +277,7 @@ public class EvalTableResult extends HashMap<String, BigDecimal> {
             return ;
         }
         this.forEach((k,v)->{
-            v=v.divide(total,4, RoundingMode.HALF_UP);
+            this.computeIfPresent(k,(key,value)->value.divide(total,4, RoundingMode.HALF_UP));
         });
     }
 }