From 8f1d3fdf2abc49e164cb6cf4eb9613895bbe2649 Mon Sep 17 00:00:00 2001
From: feng <18691763612@163.com>
Date: Sat, 13 Dec 2025 15:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=91=BC=E5=85=A5=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/renkang/emergency/entity/TblUserHelpVo.java   |  3 +++
 .../service/impl/TblUserHelpServiceImpl.java          | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java
index 62d038c..e3b7211 100644
--- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java
+++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblUserHelpVo.java
@@ -30,6 +30,9 @@ public class TblUserHelpVo {
     @Parameter(description = "累计处置")
     private Integer totalacceptance;
 
+    @Parameter(description = "近7天的累计处置") //固定查近七天的数据, 和传入的时间筛选无关
+    private Integer lastSevenTotal;
+
     @Parameter(description = "交易")
     private Integer totaldeal;
 }
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
index 0825226..b324b18 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
@@ -1,5 +1,6 @@
 package com.renkang.emergency.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -172,8 +173,10 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
             int count = Math.toIntExact(list.stream().filter(a -> "1".equals(a.getType())).count());
             vo.setDbjy(count);
         }
-        // 累计处置
-        Integer totalAcceptance = tblUserHelpMapper.getTotalAcceptance();
+        // 累计处置  20251212改查询累积处置暂时没有限制 status状态,只有存在呼入记录即代表处理
+        LambdaQueryWrapper<TblUserHelp> countWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StrUtil.isNotEmpty(dto.getCenterId()),TblUserHelp::getCenterId, dto.getCenterId());
+        int totalAcceptance = tblUserHelpMapper.selectCount(countWrapper).intValue();
         if ("1".equals(dataDetailVO.getTotalDisposalStatus())) {
             if (dataDetailVO.getTotalDisposal().contains("+")) {
                 vo.setTotalacceptance(totalAcceptance + Integer.parseInt(dataDetailVO.getTotalDisposal().replace("+", "").trim()));
@@ -183,6 +186,10 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
         }else {
             vo.setTotalacceptance(totalAcceptance);
         }
+        // 近七天累积处置 20251212新疆项目新加 , 暂时没有假数据的逻辑 , 查询累积处置暂时没有限制 status状态,只有存在呼入记录即代表处理
+        queryWrapper.ge(TblUserHelp::getHelpTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(),-7)));
+        int lastSevenTotal = tblUserHelpMapper.selectCount(countWrapper).intValue();
+        vo.setLastSevenTotal(lastSevenTotal);
         return vo;
     }