From 566523c9c5e7e75cf243431be847242ea018dec0 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 13 一月 2026 17:32:29 +0800
Subject: [PATCH] 【市一】获取随访统计比例sql调整
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 3
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 143 +++++++++++++++++++++++++++++++++++++++++++----
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java | 9 +++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 14 ++++
4 files changed, 151 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index ae7b580..656e410 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.github.pagehelper.ISelect;
+import com.github.pagehelper.Page;
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.CacheConstants;
@@ -561,8 +562,6 @@
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
}
- PageUtils.startPageByPost(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
-
String configKey = serviceSubtaskCountReq.getConfigKey();
if (StringUtils.isNotEmpty(configKey)) {
String configValue = configService.selectConfigByKey(configKey);
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index f6654bf..0d3f6b3 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -47,6 +47,9 @@
@ApiModelProperty(value = "绉戝Code闆嗗悎")
private List<String> deptcodes;
+ @ApiModelProperty(value = "瀛愪换鍔d闆嗗悎")
+ private List<Long> subTaskIds;
+
@ApiModelProperty(value = "绉戝鐥呭尯")
private Integer statisticaltype;
@@ -78,6 +81,12 @@
private String orgid;
/**
+ * 闄㈠尯缂栫爜
+ */
+ @ApiModelProperty("闄㈠尯缂栫爜")
+ private String campusid;
+
+ /**
* 闂缂栫爜-鏌ヨ浣跨敤锛屾敮鎸佸涓棶棰橈紝鐢ㄩ�楀彿鍖哄垎
*/
@ApiModelProperty(value = "闂缂栫爜")
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index dd21087..ee3ab44 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2788,6 +2788,124 @@
return serviceSubtaskStatistic;
}
+ private ServiceSubtaskStatistic getStatisticCategory(List<ServiceSubtask> serviceSubtaskList, ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
+ //鏍煎紡鍖栦负涓や綅灏忔暟鐨勭櫨鍒嗘瘮
+ DecimalFormat percentFormat = new DecimalFormat("##.##%");
+ serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getDeptname());
+ serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
+ serviceSubtaskStatistic.setLeavehospitaldistrictname(serviceSubtaskList.get(0).getLeavehospitaldistrictname());
+ serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
+ serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
+ serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
+ //鍑洪櫌浜烘
+ serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ serviceSubtaskStatistic.setJoyCount(0);
+ serviceSubtaskStatistic.setJoyAllCount(0);
+
+ //鑾峰彇闅忚缁熻
+ List<Long> subTaskIds = new ArrayList<>();
+ if(ObjectUtils.isNotEmpty(serviceSubtaskList)){
+ subTaskIds = serviceSubtaskList.stream().map(ServiceSubtask::getId) // 鎻愬彇瀛楁
+ .filter(Objects::nonNull) // 杩囨护 null 鍊�
+ .filter(id -> ObjectUtils.isNotEmpty(id)) // 杩囨护绌哄瓧绗︿覆锛堝彲閫夛級
+ .distinct() // 鍘婚噸
+ .collect(Collectors.toList()); // 鏀堕泦鍒� List
+ serviceSubtaskCountReq.setSubTaskIds(subTaskIds);
+ }
+ List<ServiceSubtaskCount> subCounts = new ArrayList<>();
+ subCounts = serviceSubtaskMapper.getSfStatisticsCategory(serviceSubtaskCountReq);
+
+ for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ List<ServiceSubtaskCount> subCountTemp = subCounts.stream().filter(r -> r.getSubTaskId().equals(serviceSubtask.getId())).collect(Collectors.toList());
+
+ //缁熻
+ if (subCountTemp != null && subCountTemp.size() > 0) {
+ if (ObjectUtils.isNotEmpty(subCountTemp.get(0).getJoyCount()))
+ serviceSubtaskStatistic.setJoyCount(serviceSubtaskStatistic.getJoyCount() + subCountTemp.get(0).getJoyCount());
+ if (ObjectUtils.isNotEmpty(subCountTemp.get(0).getJoyAllCount()))
+ serviceSubtaskStatistic.setJoyAllCount(serviceSubtaskStatistic.getJoyAllCount() + subCountTemp.get(0).getJoyAllCount());
+ }
+ //鏃犻渶闅忚浜烘
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
+ serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+ }
+ //搴旈殢璁夸汉娆�
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
+ serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
+ }
+
+ //棣栨鍑洪櫌闅忚
+ if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() == 1) {
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
+ serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
+ serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6)) {
+ serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
+ serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
+ }
+ if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
+ double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
+ serviceSubtaskStatistic.setFollowUpRate(percentFormat.format(rate));
+ } else {
+ serviceSubtaskStatistic.setFollowUpRate("0.00%");
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+ serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+ serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+ serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
+ serviceSubtaskStatistic.setAbnormal(serviceSubtaskStatistic.getAbnormal() + 1L);
+ }
+ }//浜屾鍑洪櫌闅忚
+ else if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() > 1) {
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
+ serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
+ serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
+ serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
+ serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
+ }
+ if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
+ double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain();
+ serviceSubtaskStatistic.setFollowUpRateAgain(percentFormat.format(rate));
+ } else {
+ serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+ serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+ serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+ serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
+ }
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
+ serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
+ }
+ }
+
+ }
+
+ return serviceSubtaskStatistic;
+ }
+
private IvrTaskTemplateScriptVO getNextQuestion(List<IvrTaskTemplateScriptVO> IvrTaskTemplateScriptVOList, IvrTaskTemplateScriptVO IvrTaskTemplateScriptVO) {
for (int j = 0; j < IvrTaskTemplateScriptVOList.size(); j++) {
@@ -2974,14 +3092,11 @@
collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
}
}
- //鑾峰彇闅忚缁熻
- List<ServiceSubtaskCount> subCount = new ArrayList<>();
- subCount = serviceSubtaskMapper.getSfStatisticsCategory(serviceSubtaskCountReq);
for (List<ServiceSubtask> serviceSubtaskList : collect.values()) {
if (CollectionUtils.isEmpty(serviceSubtaskList)) {
continue;
}
- ServiceSubtaskStatistic statistic = getStatisticJoy(serviceSubtaskList, subCount);
+ ServiceSubtaskStatistic statistic = getStatisticCategory(serviceSubtaskList, serviceSubtaskCountReq);
//鍙婃椂鐜�
ServiceSubtask ss = new ServiceSubtask();
orgid = serviceSubtaskList.get(0).getOrgid();
@@ -3012,24 +3127,24 @@
if (CollectionUtils.isNotEmpty(serviceSubtaskStatistics)) {
for (ServiceSubtaskStatistic serviceSubtaskStatistic : serviceSubtaskStatistics) {
//鑾峰彇婊℃剰搴﹂鐩�婚噺
- BigDecimal mydtmzlsum = new BigDecimal(0);
+ BigDecimal sum = new BigDecimal(0);
//鑾峰彇婊℃剰搴﹂鐩～鎶ラ噺
- BigDecimal mydtblsum = new BigDecimal(0);
+ BigDecimal finishedSum = new BigDecimal(0);
//瀹屾垚姣斾緥
- Double wcbl = null;
+ Double finishedPercentage = null;
if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyAllCount())){
- mydtblsum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
+ finishedSum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
}
if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyCount())){
- mydtmzlsum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
+ sum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
}
- if(mydtmzlsum.intValue() != 0){
- wcbl = mydtblsum.divide(mydtmzlsum, 2, RoundingMode.HALF_UP).doubleValue();
+ if(sum.intValue() != 0){
+ finishedPercentage = finishedSum.divide(sum, 2, RoundingMode.HALF_UP).doubleValue();
}
- serviceSubtaskStatistic.setJoyAllCount(mydtmzlsum.intValue());
- serviceSubtaskStatistic.setJoyCount(mydtblsum.intValue());
- serviceSubtaskStatistic.setJoyTotal(wcbl);
+ serviceSubtaskStatistic.setJoyAllCount(sum.intValue());
+ serviceSubtaskStatistic.setJoyCount(finishedSum.intValue());
+ serviceSubtaskStatistic.setJoyTotal(finishedPercentage);
}
}
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 6385d61..06bb5ab 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1209,6 +1209,9 @@
<if test="type != null">
and type = #{type}
</if>
+ <if test="pageSize != null and pageNum != null">
+ limit ${pageSize} OFFSET ${pageNum}
+ </if>
</select>
<select id="getSfStatisticsJoy" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
@@ -1341,8 +1344,8 @@
</if>
<if test="configValue != null and configValue != ''">
SUM(CASE WHEN a.categoryid IN(${configValue})
- AND a.matchedtext is not null
- AND a.matchedtext != ''
+ AND IFNULL(a.matchedtext,a.asrtext) is not null
+ AND IFNULL(a.matchedtext,a.asrtext) != ''
THEN 1 ELSE 0 END) AS joyCount,
</if>
a.sub_id as subTaskId
@@ -1368,6 +1371,13 @@
#{deptcode}
</foreach>
</if>
+ <if test="subTaskIds != null and subTaskIds.size() > 0">
+ AND t.id IN
+ <foreach collection="subTaskIds" item="subTaskId" open="(" separator=","
+ close=")">
+ #{subTaskId}
+ </foreach>
+ </if>
<if test="serviceType != null and serviceType.size() > 0">
AND t.service_type IN
<foreach collection="serviceType" item="serviceType" open="(" separator=","
--
Gitblit v1.9.3