From 38481ffde1ad9d9cd6cd3cc73c66babc18eabe63 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 03 四月 2026 15:48:14 +0800
Subject: [PATCH] 【丽水】历史随访 selectServiceSubtaskByDiagname 不查宣教数据

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 24990ba..6ed0dce 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -651,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=","
@@ -703,6 +709,7 @@
             resultMap="ServiceSubtaskResult">
         select sendstate,starttime,endtime,nurse_name,phone,sex,task_name,sendname,leavediagname,visit_time FROM
         service_subtask WHERE del_flag=0
+        and service_type != 4
         <if test="leavediagname != null">and leavediagname like concat('%',#{leavediagname}, '%')</if>
         <if test="sendname != null">and sendname like concat('%',#{sendname}, '%')</if>
         <if test="taskName != null">and task_name like concat('%',#{taskName}, '%')</if>
@@ -1393,6 +1400,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=","
@@ -1449,6 +1462,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}
         </if>

--
Gitblit v1.9.3