From 8a746c47c2ea84f762c719b7a0786f62fcc80497 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 15 九月 2026 14:48:09 +0800
Subject: [PATCH] 1.支持科室、题目查询的科室评分表

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c48146a..35aa60f 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -213,7 +213,6 @@
                create_time,
                isupload,
                upload_time,
-               orgid,
                pid,
                guid,
                text_param,
@@ -236,8 +235,6 @@
                leaveicd10code,
                orgid,
                visit_type,
-               management_doctor,
-               management_doctor_code,
                continue_flag,
                continue_time_now,
                continue_content,
@@ -362,6 +359,12 @@
             AND operation_item_id IN
             <foreach collection="operationItemIds" item="operationItemIdItem" open="(" separator="," close=")">
                 #{operationItemIdItem}
+            </foreach>
+        </if>
+        <if test="inhospids != null and inhospids.size() > 0">
+            AND inhospid IN
+            <foreach collection="inhospids" item="inhospidItem" open="(" separator="," close=")">
+                #{inhospidItem}
             </foreach>
         </if>
         <if test="templateid != null  and templateid != ''">and templateid = #{templateid}</if>
@@ -3209,21 +3212,22 @@
         SELECT questiontext,
         d.taskid,
         s.deptname,
+        d.create_time as createTime,
         s.leavehospitaldistrictname,
         d.targetvalue,
         d.asrtext,
         COUNT(d.asrtext) AS answercount,
-        SUM(d.score) AS singleScore
+        d.score AS singleScore
         FROM service_subtask_detail d,
         service_task s
         WHERE d.taskid = s.taskid
         AND deptname IS NOT NULL
         AND leavehospitaldistrictname IS NOT NULL
         <if test="endFinishTime != null">
-            AND create_time &lt; #{endFinishTime}
+            AND d.create_time &lt; #{endFinishTime}
         </if>
         <if test="startFinishTime != null">
-            AND create_time &gt;= #{startFinishTime}
+            AND  d.create_time &gt;= #{startFinishTime}
         </if>
         <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
             AND leavehospitaldistrictcode IN
@@ -3242,6 +3246,11 @@
         </if>
         GROUP BY d.questiontext,
         d.taskid,
+        d.score,
+        s.deptname,
+        d.targetvalue,
+        d.create_time,
+        s.leavehospitaldistrictname,
         d.asrtext
         ORDER BY d.taskid
     </select>

--
Gitblit v1.9.3