From fbe0fc0d9ee2012f6083bd802670453d788002d6 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 22 九月 2026 11:36:04 +0800
Subject: [PATCH] 【丽水】导出时间格式问题处理

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index e56443a..f902060 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -3036,7 +3036,7 @@
                ROUND(avg(d.score), 2) AS totalScore
         FROM service_subtask_detail d
                  JOIN service_task t ON d.taskid = t.taskid
-        WHERE t.service_type IN (6, 14)
+        WHERE t.service_type IN (14)
           AND t.del_flag = 0
           AND d.del_flag = 0
           AND d.create_time >= #{startFinishTime}
@@ -3493,7 +3493,13 @@
         WHERE s.del_flag = '0'
         AND d.del_flag = '0'
         AND s.sendstate = 6
-        AND s.service_type = #{serviceType}
+        <if test="serviceTypes != null and serviceTypes.size() > 0">
+            AND service_type IN
+            <foreach collection="serviceTypes" item="serviceType" open="(" separator=","
+                     close=")">
+                #{serviceType}
+            </foreach>
+        </if>
 <!--        &lt;!&ndash; 鍙彇鍏紡閲岀殑浜旀。鏉冮噸锛岀┖鍊�/0/鏈瓟绛夋棦涓嶈繘鍒嗗瓙涔熶笉杩涘垎姣� &ndash;&gt;-->
 <!--        AND CAST(d.score AS DECIMAL(10,4)) IN (1, 0.8, 0.6, 0.4, 0.2)-->
         <!-- 鍚屼竴瀛愪换鍔″悓涓�棰樼洰鍙繚鐣欐渶鏂颁竴鏉★紝閬垮厤閲嶇瓟琚噸澶嶈鍏ラ」鏁� -->
@@ -3516,6 +3522,9 @@
         <if test="endFinishTime != null">
             AND s.finishtime &lt; DATE_ADD(#{endFinishTime}, INTERVAL 1 DAY)
         </if>
+        <if test="questionText != null  and questionText != ''">and d.questiontext like concat('%', #{questionText},
+            '%')
+        </if>
         <choose>
             <when test='dimensionType == "2"'>
                 AND s.leavehospitaldistrictcode IS NOT NULL AND s.leavehospitaldistrictcode &lt;&gt; ''

--
Gitblit v1.9.3