20250227 更新

优化图标统计

src/main/java/digital/laboratory/platform/entrustment/convert/EntrustMaterialCheckoutResultConvert.java

@@ -1,15 +1,10 @@
 package digital.laboratory.platform.entrustment.convert;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import digital.laboratory.platform.entrustment.dto.EntrustMaterialCheckoutResultDTO;
 import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult;
 import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
-import digital.laboratory.platform.sys.entity.DrugLite;
-
-import java.util.stream.Collectors;
 
 /**
  * 托检材--检出定性定量结果信息 转换类

src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java

@@ -79,6 +79,7 @@ import java.math.RoundingMode;
 import java.security.Principal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -3255,9 +3256,26 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                         Collections.EMPTY_LIST
                 ).size(),
                 "待受理 (大数据平台)"));
-        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, entrustListMap.getOrDefault(StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST).size(), String.format("已受理 (%s)", EntrustMarkConstants.PUBLIC_SECURITY_BUREAU)));
-        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, entrustListMap.getOrDefault(StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST).size(), "已受理 (大数据平台)"));
-        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, this.list(Wrappers.<Entrustment>lambdaQuery().inSql(Entrustment::getId, "SELECT entrust_id FROM b_entrust_material_checkout_result")).size(), "检测结果"));
+        List<Entrustment> entrustListMapOrDefault = entrustListMap.getOrDefault(
+                StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST
+        );
+        // o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN)) 筛选出当年的数据
+        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
+                entrustListMapOrDefault.stream().filter(o -> o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN))).collect(Collectors.toList()).size(),
+                String.format("已受理 (%s)", EntrustMarkConstants.PUBLIC_SECURITY_BUREAU)));
+        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
+                entrustListMap.getOrDefault(
+                        StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST
+                ).size(),
+                "已受理 (大数据平台)"));
+        markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
+                this.list(Wrappers.<Entrustment>lambdaQuery().inSql(Entrustment::getId, "SELECT entrust_id FROM b_entrust_material_checkout_result"))
+                        .stream()
+                        .filter(o -> o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN)))
+                        .collect(Collectors.toList())
+                        .size(),
+                "检测结果")
+        );
         markersVOS.add(new MarkersVO(EntrustMarkConstants.REVIEW_OR_APPROVAL,
                 REVIEW_STATUS_GROUP1.stream()
                         .mapToInt(status -> entrustListMap.getOrDefault(EntrustMarkConstants.LOCAL_SYSTEM + "_" + status, Collections.emptyList()).size())