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/SvyLibTemplateMapper.xml | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
index c474be4..3d0c5f6 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -123,18 +123,71 @@
LEFT JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
icd10_association group by outid) b ON a.del_flag = 0
AND a.svyid = b.outid
- <where>
- a.del_flag=0
- <if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
- <if test="svyid != null ">and a.svyid = #{svyid}</if>
- <if test="longTemp != null ">and a.long_temp = #{longTemp}</if>
- <if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
- <if test="description != null and description != ''">and b.icd10name like concat('%', #{description}, '%')
- </if>
- </where>
+ where 1=1
+ and a.del_flag=0
+ <if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
+ <if test="svyid != null ">and a.svyid = #{svyid}</if>
+ <if test="longTemp != null ">and a.long_temp = #{longTemp}</if>
+ <if test="orgid != null ">and a.orgid = #{orgid}</if>
+ <if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
+ <if test="description != null and description != ''">and b.icd10name like concat('%', #{description}, '%')
+ </if>
order by a.create_time desc
</select>
+
+ <select id="selectSvyLibTemplateListByDeptCode" parameterType="com.smartor.domain.TemplateDeptVO"
+ resultMap="SvyLibTemplateResult">
+ SELECT
+ a.svyid,
+ a.long_temp,
+ a.conclusion,
+ a.instruction,
+ a.prologue,
+ a.categoryid,
+ a.svycode,
+ a.svyname,
+ a.description,
+ a.introduce,
+ a.submitprompt,
+ a.templateid,
+ a.version,
+ a.centerlibrarycode,
+ a.centerlibraryid,
+ a.islocal,
+ a.isenable,
+ a.orgid,
+ a.del_flag,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ a.isupload,
+ a.upload_time,
+ a.dept_names,
+ a.value_type,
+ a.reply,
+ a.campus,
+ a.suitway,
+ a.script_score,
+ a.score_type,
+ a.otherdata,
+ a.guid
+ FROM
+ svy_lib_template a
+ LEFT JOIN template_dept b ON a.del_flag = 0
+ AND a.svyid = b.tempid
+ where a.del_flag=0
+ and b.del_flag=0
+ <if test="orgid != null and orgid != ''">and a.orgid = #{orgid}</if>
+ <if test="deptCode != null ">and b.dept_code = #{deptCode}</if>
+ <if test="deptType != null ">and b.dept_type = #{deptType}</if>
+ <if test="type != null">and b.type=#{type}</if>
+ <if test="tempid != null">and a.svyid=#{tempid}</if>
+ order by a.create_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+ </select>
+
<select id="selectSvyLibTemplateBySvyid" parameterType="Long" resultMap="SvyLibTemplateResult">
<include refid="selectSvyLibTemplateVo"/>
where svyid = #{svyid} and del_flag=0
--
Gitblit v1.9.3