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/PatArchiveOutMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml
index ed9d355..ecb4b41 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml
@@ -120,12 +120,12 @@
         <if test="orgid != null and orgid != ''">
             AND orgid = #{orgid}
         </if>
-        <if test="deptcodes != null ">and deptcode in
+        <if test="deptcodes != null and deptcodes.size() > 0">and deptcode in
             <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
                 #{deptcode}
             </foreach>
         </if>
-        <if test="drCodes != null ">and drcode in
+        <if test="drCodes != null and drCodes.length > 0">and drcode in
             <foreach collection="drCodes" item="drCode" open="(" separator="," close=")">
                 #{drCode}
             </foreach>
@@ -137,12 +137,12 @@
         <if test="orgid != null and orgid != ''">
             AND orgid = #{orgid}
         </if>
-        <if test="deptcodes != null ">and leaveldeptcode in
+        <if test="deptcodes != null and deptcodes.size() > 0">and leaveldeptcode in
             <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
                 #{deptcode}
             </foreach>
         </if>
-        <if test="drCodes != null ">and drcode in
+        <if test="drCodes != null and drCodes.length > 0">and drcode in
             <foreach collection="drCodes" item="drCode" open="(" separator="," close=")">
                 #{drCode}
             </foreach>

--
Gitblit v1.9.3