From bcdfe28e6cb8737c6dd4bc165557c388ba7e9ef5 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 03 十一月 2026 10:49:46 +0800
Subject: [PATCH] 【丽水】首次再次 patItem查询问题

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 6fdd494..371bbab 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -410,7 +410,6 @@
         <if test="managementDoctorCode != null ">and management_doctor_code = #{managementDoctorCode}</if>
         <if test="submit != null ">and submit = #{submit}</if>
         <if test="upid != null ">and upid = #{upid}</if>
-        <if test="visitCount != null ">and visit_count = #{visitCount}</if>
         <if test="patfrom != null ">and patfrom = #{patfrom}</if>
         <if test="serviceType != null ">and service_type = #{serviceType}</if>
         <if test="patid != null ">and patid = #{patid}</if>
@@ -1970,9 +1969,6 @@
         <if test="groupKey != null and groupKey != ''">
             group by ${groupKey}
         </if>
-        <if test="pageSize != null  and pageNum != null">
-            limit ${pageSize} OFFSET ${pageNum}
-        </if>
     </select>
 
     <select id="getSfStatisticsHyperlink" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
@@ -2070,10 +2066,15 @@
         <if test="type != null">
             and type = #{type}
         </if>
-        <if test="visitCount != null and visitCount == 1">
+        <!-- 棣栦釜鍐嶆闅忚锛氱簿纭煡 visit_count = 2锛屼笌缁熻鍙e緞涓�鑷� -->
+        <if test="hyperLinkInfoType == 'againFollowUpPushCountInfo'">
+            AND visit_count = 2
+        </if>
+        <!-- 鍏朵粬绫诲瀷淇濇寔鍘熻涔夛細1 棣栨锛�>1 鍐嶆 -->
+        <if test="hyperLinkInfoType != 'againFollowUpPushCountInfo' and visitCount != null and visitCount == 1">
             AND visit_count = 1
         </if>
-        <if test="visitCount != null and visitCount > 1">
+        <if test="hyperLinkInfoType != 'againFollowUpPushCountInfo' and visitCount != null and visitCount > 1">
             AND visit_count > 1
         </if>
         <if test="groupKey != null and groupKey != '' and groupKeyList != null and groupKeyList.size>0">
@@ -2117,6 +2118,9 @@
         <if test="isManuallyCalled != null">
             AND is_manually_called = #{isManuallyCalled}
         </if>
+        <if test="suggest != null and suggest != ''">
+            AND TRIM(suggest) = #{suggest}
+        </if>
         order by endtime desc
         <if test="pageSize != null  and pageNum != null">
             limit ${pageSize} OFFSET ${pageNum}

--
Gitblit v1.9.3