From d1995068ddc93414e01a02bd0a21626a4a6ad9a4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 27 十月 2026 18:20:34 +0800
Subject: [PATCH] 【丽水】1、新增接口 \smartor\doc\api\dealIcd10Subtask 2、/smartor/serviceSubtask/addSubTaskAgain 随访方式控制                                               随访是走中心科室还是本科室 3、/smartor/serviceSubtask/addSubTaskAgain 未配置nexttaskid的默认取自己的taskid

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 0f34f88..e1f7071 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -82,6 +82,7 @@
         <result property="visitCount" column="visit_count"/>
         <result property="isVisitAgain" column="is_visit_again"/>
         <result property="upid" column="upid"/>
+        <result property="visitType" column="visit_type"/>
         <result property="visitTime" column="visit_time"/>
         <result property="visitDeptName" column="visit_dept_name"/>
         <result property="visitDeptCode" column="visit_dept_code"/>
@@ -949,6 +950,12 @@
         </if>
         <if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
         <if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
+        <if test="startOutHospTime != null">
+            AND date_format(endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
+        </if>
+        <if test="endOutHospTime != null">
+            AND date_format(endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
+        </if>
         ) a where a.finished =1)
     </select>
 
@@ -2281,14 +2288,14 @@
     <select id="getSfStatisticsScriptDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
             resultMap="ServiceSubtaskScriptCountResult">
         SELECT
-        a.id as scriptid,
-        a.templateid as templateid,
-        a.script_type,
+        MIN(a.id) as scriptid,
+        MIN(a.templateid) as templateid,
+        MIN(a.script_type) as script_type,
         a.script_content,
         b.subtask_type,
-        b.completed_quantity,
-        b.all_quantity,
-        ROUND(b.completed_quantity/b.all_quantity,2) as completed_percentage
+        SUM(b.completed_quantity) as completed_quantity,
+        SUM(b.all_quantity) as all_quantity,
+        ROUND(SUM(b.completed_quantity)/SUM(b.all_quantity),2) as completed_percentage
         FROM
         <if test="type == 1">
             ivr_task_template_script a
@@ -2351,25 +2358,37 @@
         group by ssd.scriptid) b
         ON a.id = b.scriptid
         <!-- 閫傜敤鍗曟潯鏌ヨ -->
-        <if test="scriptids != null">
+        <if test="scriptids != null and scriptids != ''">
             AND a.scriptid in
             (SELECT lib_script.scriptid FROM
             svy_lib_template_script lib_script
             WHERE lib_script.scriptid in (${scriptids}))
         </if>
+        <!-- 鍚屼竴閬撻浼氳澶嶅埗鍒板涓换鍔℃ā鏉匡紝鎸夐鐩唴瀹瑰悎骞讹紝淇濊瘉涓�閬撻鍙繑鍥炰竴鏉� -->
+        GROUP BY a.script_content, b.subtask_type
+        ORDER BY MIN(a.id)
     </select>
 
     <select id="getSfStatisticsScriptItemDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
             resultMap="ServiceSubtaskScriptCountResult">
         SELECT
-        ssd.scriptid,
+        a.script_content,
+        ss.type as subtask_type,
         IFNULL(ssd.matchedtext,ssd.asrtext) AS option_text,
         COUNT(*) AS chosen_quantity
         FROM
         service_subtask_detail ssd
         INNER JOIN service_subtask ss ON ssd.sub_id = ss.id
+        INNER JOIN
+        <if test="type == 1">
+            ivr_task_template_script a ON a.id = ssd.scriptid
+        </if>
+        <if test="type == 2">
+            svy_task_template_script a ON a.id = ssd.scriptid
+        </if>
         where 1=1
         and ss.del_flag=0
+        and ssd.del_flag=0
         <if test="orgid != null and orgid != ''">
             and ss.orgid = #{orgid}
         </if>
@@ -2408,7 +2427,7 @@
         <if test="configValue != null and configValue != ''">
             AND ssd.categoryid IN (${configValue})
         </if>
-        group by ssd.scriptid, IFNULL(ssd.matchedtext,ssd.asrtext)
+        group by a.script_content, ss.type, IFNULL(ssd.matchedtext,ssd.asrtext)
     </select>
 
     <select id="getDataByTime" resultMap="ServiceSubtaskResult">

--
Gitblit v1.9.3