From 15aca11333c9c3d92b5bbff364373ab0feb5f6c3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 八月 2026 19:21:31 +0800
Subject: [PATCH] 1.修改一下delete、put请求 2.新增一个万能密码 3.处理一下选项中还把a,b,c,d也带上的情况
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index eb75f99..1dcc537 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -506,10 +506,10 @@
<if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
<if test="visitCount != null and visitCount > 1 and visitDeptCodes != null and visitDeptCodes.size() > 0">
AND visit_dept_code IN
- <foreach collection="visitDeptCodes" item="visitDeptCodes" open="("
+ <foreach collection="visitDeptCodes" item="visitDeptCode" open="("
separator=","
close=")">
- #{visitDeptCodes}
+ #{visitDeptCode}
</foreach>
</if>
<if test="sort != null and sort==0">order by endtime asc</if>
@@ -1817,7 +1817,8 @@
continue_content,
continue_count,
continue_time_next,
- task_situation
+ task_situation,
+ remark
from service_subtask
where 1=1
and del_flag = 0
@@ -2559,8 +2560,9 @@
</if>
</if>
<if test="deptOrDistrict==2">
+ AND (1=1
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
- AND (leavehospitaldistrictcode IN
+ AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
separator=","
close=")">
@@ -2570,17 +2572,18 @@
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
OR deptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close="))">
+ close=")">
#{leaveldeptcode}
</foreach>
</if>
+ )
</if>
<if test="visitCount != null and visitCount > 1 and visitDeptCodes != null and visitDeptCodes.size() > 0">
AND visit_dept_code IN
- <foreach collection="visitDeptCodes" item="visitDeptCodes" open="("
+ <foreach collection="visitDeptCodes" item="visitDeptCode" open="("
separator=","
close=")">
- #{visitDeptCodes}
+ #{visitDeptCode}
</foreach>
</if>
<if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
@@ -2994,7 +2997,8 @@
continue_content,
continue_count,
continue_time_next,
- task_situation
+ task_situation,
+ remark
from service_subtask
where 1=1
and del_flag = 0
@@ -3037,6 +3041,7 @@
SELECT
d.questiontext AS questiontext,
t.taskid AS taskid,
+ t.task_name AS taskName,
d.asrtext AS optionresult,
COUNT(*) AS count,
CONCAT(ROUND(COUNT(*) * 100.0 / t2.total_count, 2), '%') AS ratio
--
Gitblit v1.9.3