From 75dd91a2aa8682d458fd3dc6df6a52feb43a0c89 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 03 四月 2026 14:17:28 +0800
Subject: [PATCH] 【丽水】随访统计 首次再次分开

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 20ba963..ba2e7d7 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -466,6 +466,7 @@
         <if test="sort != null  and sort==6">order by admindate desc</if>
         <if test="sort != null  and sort==7">order by visit_time asc</if>
         <if test="sort != null  and sort==8">order by visit_time desc</if>
+        <if test="sort != null  and sort==9">order by sendname asc</if>
         <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
     </select>
     <select id="getCompensateServiceSubtaskList" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
@@ -650,6 +651,12 @@
         </if>
         <if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
         <if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
+        <if test="visitCount != null and visitCount == 1">
+            AND visit_count = 1
+        </if>
+        <if test="visitCount != null and visitCount > 1">
+            AND visit_count > 1
+        </if>
         <if test="groupKey != null and groupKey != ''">
             AND ${groupKey} IN
             <foreach collection="groupKeyList" item="key" open="(" separator=","
@@ -1392,6 +1399,12 @@
         <if test="type != null">
             and type = #{type}
         </if>
+        <if test="visitCount != null and visitCount == 1">
+            AND visit_count = 1
+        </if>
+        <if test="visitCount != null and visitCount > 1">
+            AND visit_count > 1
+        </if>
         <if test="groupKey != null and groupKey != '' and groupKeyList != null and groupKeyList.size>0">
             AND ${groupKey} IN
             <foreach collection="groupKeyList" item="key" open="(" separator=","
@@ -1447,6 +1460,12 @@
         <!-- 鐩墠鍙粺璁¤闊冲拰闂嵎 -->
         <if test="type != null">
             and type = #{type}
+        </if>
+        <if test="visitCount != null and visitCount == 1">
+            AND visit_count = 1
+        </if>
+        <if test="visitCount != null and visitCount > 1">
+            AND visit_count > 1
         </if>
         <if test="groupKey != null and groupKey != ''">
             group by ${groupKey}
@@ -1894,6 +1913,9 @@
         FROM service_subtask
         WHERE DATE_FORMAT(finishtime, '%Y-%m-%d') >= #{startDate}
           AND DATE_FORMAT(finishtime, '%Y-%m-%d') &lt;= #{endDate}
+        <if test="orgid != null">
+            AND orgid = #{orgid}
+        </if>
         GROUP BY deptname
     </select>
 
@@ -2236,6 +2258,9 @@
         <if test="excep != null ">
             AND excep = #{excep}
         </if>
+        <if test="taskName != null  and taskName != ''">
+            AND task_name like concat('%', #{taskName}, '%')
+        </if>
         <if test="visitCount != null and visitCount == 1">
             AND visit_count = 1
         </if>

--
Gitblit v1.9.3