From 9fc52256df321e14a179811eda954491f5b71fea Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 09 一月 2026 17:55:19 +0800
Subject: [PATCH] 【市一】问题统计接口调整
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 64351d6..7286c66 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1330,19 +1330,25 @@
<select id="getSfStatisticsCategory" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
- SELECT a.sub_id as subTaskId,
+ SELECT
+ <if test="configValue != null and configValue != ''">
+ SUM(CASE WHEN a.categoryid IN(${configValue})
+ AND IFNULL(a.matchedtext,a.asrtext) IS NOT NULL
+ AND IFNULL(a.matchedtext,a.asrtext) != ''
+ THEN 1 ELSE 0 END) AS joyCount,
+ </if>
<if test="configValue != null and configValue != ''">
SUM(CASE WHEN a.categoryid IN(${configValue})
THEN 1 ELSE 0 END) AS joyAllCount,
</if>
- COUNT(sub_id) joyCount
+ a.sub_id as subTaskId
FROM service_subtask_detail a
INNER JOIN service_subtask t ON a.sub_id = t.id
where 1=1
and a.del_flag=0
AND t.del_flag=0
<if test="orgid != null and orgid != ''">
- and a.orgid = #{orgid}
+ and t.orgid = #{orgid}
</if>
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
AND t.leavehospitaldistrictcode IN
@@ -1414,8 +1420,8 @@
FROM
service_subtask_detail ssd
INNER JOIN service_subtask ss ON ssd.sub_id = ss.id
- WHERE
- ss.del_flag=0
+ WHERE 1=1
+ AND ss.del_flag=0
AND ssd.del_flag = 0
<if test="orgid != null and orgid != ''">
AND ss.orgid = #{orgid}
@@ -1454,6 +1460,13 @@
</if>
group by ssd.scriptid) b
ON a.id = b.scriptid
+ <!-- 閫傜敤鍗曟潯鏌ヨ -->
+ <if test="scriptids != null">
+ AND a.scriptid in
+ (SELECT lib_script.scriptid FROM
+ svy_lib_template_script lib_script
+ WHERE lib_script.scriptid in (${scriptids}))
+ </if>
</select>
<select id="getSfStatisticsScriptItemDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
@@ -1470,8 +1483,6 @@
<if test="orgid != null and orgid != ''">
and ss.orgid = #{orgid}
</if>
- AND IFNULL(ssd.matchedtext,ssd.asrtext) IS NOT NULL
- AND IFNULL(ssd.matchedtext,ssd.asrtext) != ''
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
AND ss.leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
--
Gitblit v1.9.3