From 1cb9ce3cce5a7f6d1ae4c17a2ba0b117cc42d8a9 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Sat, 28 Feb 2026 16:11:30 +0800
Subject: [PATCH] =?UTF-8?q?fix--=E6=8A=9A=E6=85=B0=E5=B1=8F=E5=B9=95?=
 =?UTF-8?q?=E6=B0=91=E8=BE=85=E8=AD=A6=E5=8F=97=E4=BC=A4=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/datav/DataVRightsComfortController.java          | 2 +-
 src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java | 2 +-
 .../biutag/supervision/pojo/model/DataRightsComfortModel.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
index 6699e69..78e67a1 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
@@ -189,7 +189,7 @@ public class DataVRightsComfortController {
                 }),
 
                 CompletableFutureUtil.runSyncObject(() -> {
-                    // 民辅警受伤情况
+                    // 抚慰情况
                     List<PieItem> data = rpcApplyMapper.selectComfortPoliceInjurySituation(beginTime, finalEndTime);
                     //获取字典中的民警类型
 
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
index fce6b93..86a9cb5 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
@@ -333,7 +333,7 @@ public interface RpcApplyMapper extends BaseMapper<RpcApply> {
     )
     List<PieItem> selectComfortPoliceInjurySituation(Date beginTime, Date endTime);
 
-    @Select("select  p.injury_severity_name name, count(r.rpc_id) value from rpc_apply r left join rpc_apply_person p on r.rpc_id = p.rpc_id where r.crt_time between #{beginTime} and #{endTime} and r.type = 2 and r.rpc_status='completed' GROUP BY p.injury_severity_name")
+    @Select("select  p.injury_severity_name name, count(r.rpc_id) value from rpc_apply r left join rpc_apply_person p on r.rpc_id = p.rpc_id where r.apply_date between #{beginTime} and #{endTime} and r.type = 2 and r.rpc_status='completed' GROUP BY p.injury_severity_name")
     List<PieItem> selectComfortInjuryCategory(Date beginTime, Date endTime);
 
 
diff --git a/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java b/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java
index 5683f0e..d6e23d7 100644
--- a/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java
+++ b/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java
@@ -43,7 +43,7 @@ public class DataRightsComfortModel {
     List<PieItem> punishmentSituation = new ArrayList<>();
     // 民辅警抚慰情况占比
     List<PieItem> comfortPoliceTypeProportion = new ArrayList<>();
-    // 民辅警受伤情况
+    // 抚慰情况
     List<PieItem> comfortPoliceInjurySituation = new ArrayList<>();
     // 民辅警受伤类别
     List<PieItem> comfortInjuryCategory = new ArrayList<>();