From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
index eb142d0..c21a7ad 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
@@ -20,7 +20,7 @@
<result property="deptCodes" column="dept_codes"/>
<result property="wardCodes" column="ward_codes"/>
<result property="icd10Codes" column="icd10_codes"/>
- <result property="oplevelCodes" column="remark"/>
+ <result property="oplevelCodes" column="oplevel_codes"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
@@ -44,10 +44,10 @@
next_execute_time,
schedule_benchmark,
schedule_benchmark_custom_time,
- deptCodes,
- wardCodes,
- icd10Codes,
- oplevelCodes,
+ dept_codes,
+ ward_codes,
+ icd10_codes,
+ oplevel_codes,
remark,
del_flag,
create_by,
@@ -186,6 +186,12 @@
and del_flag = '0'
</update>
+ <delete id="hardDeleteByTaskid" parameterType="Long">
+ delete from service_task_schedule
+ where del_flag = '0'
+ and taskid = #{taskid}
+ </delete>
+
<select id="selectActiveCycleSchedules" resultMap="ServiceTaskScheduleResult">
<include refid="selectServiceTaskScheduleVo"/>
where del_flag = '0'
--
Gitblit v1.9.3