From 90e436edb375b1983f16aa10066497fbabbaa010 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期五, 30 五月 2025 13:58:52 +0800
Subject: [PATCH] 05-30 zhs

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c8d9fb7..e76a4e5 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -287,7 +287,13 @@
             <if test="excep != null ">and excep = #{excep}</if>
             <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
             <if test="score != null">and score = #{score}</if>
-            <if test="visitCount != null">and visit_count = #{visitCount}</if>
+<!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
+            <if test="visit_count_flag != null and visit_count_flag == 0">
+                AND visit_count = 1
+            </if>
+            <if test="visit_count_flag != null and visit_count_flag == 1">
+                AND visit_count > 1
+            </if>
             <if test="remark != null">and remark = #{remark}</if>
             <if test="suggest != null">and suggest = #{suggest}</if>
             <if test="createBy != null">and create_by = #{createBy}</if>
@@ -323,6 +329,57 @@
 
     </select>
 
+
+    <select id="selectServiceSubtaskListAgain" parameterType="com.smartor.domain.ServiceSubtaskVO"
+            resultMap="ServiceSubtaskResult">
+        <include refid="selectServiceSubtaskVo"/>
+        <where>
+            del_flag=0
+            and upid is not null
+            and visit_count > 1
+            <if test="createStartTime != null  and createEndTime != null">and create_time BETWEEN #{createStartTime} AND
+                #{createEndTime}
+            </if>
+            <if test="senddate != null ">and senddate = #{senddate}</if>
+            <if test="senduuid != null  and senduuid != ''">and senduuid = #{senduuid}</if>
+            <if test="result != null  and result != ''">and result = #{result}</if>
+            <if test="finishtime != null ">and finishtime = #{finishtime}</if>
+            <if test="recordid != null ">and recordid = #{recordid}</if>
+            <if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
+            <if test="pulltime != null ">and pulltime = #{pulltime}</if>
+            <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
+            <if test="deptname != null  and deptname != ''">and deptname = #{deptname}</if>
+            <if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="preachform != null ">and preachform = #{preachform}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+            <if test="textParam != null  and textParam != ''">and text_param = #{textParam}</if>
+            <if test="bedNo != null">and bed_no = #{bedNo}</if>
+            <if test="sendType != null  and sendType != ''">and send_type = #{sendType}</if>
+            <if test="operator != null  and operator != ''">and operator = #{operator}</if>
+            <if test="operatorNo != null  and operatorNo != ''">and operator_no = #{operatorNo}</if>
+            <if test="wechat != null  and wechat != ''">and wechat = #{wechat}</if>
+            <if test="hospType != null  and hospType != ''">and hosp_type = #{hospType}</if>
+            <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
+            <if test="libtemplatename != null ">and libtemplatename = #{libtemplatename}</if>
+            <if test="openid != null ">and openid = #{openid}</if>
+            <if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
+            <if test="sendstate != null ">and sendstate = #{sendstate}</if>
+            <if test="drname != null  and drname != ''">and drname like concat('%', #{drname}, '%')</if>
+            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="drcode != null and drcode != ''">and (drcode = #{drcode}</if>
+            <if test="nurseId != null  and nurseId != ''">or nurse_id = #{nurseId})</if>
+            <if test="starttime != null ">and starttime = #{starttime}</if>
+            <if test="endtime != null ">and endtime = #{endtime}</if>
+            <if test="excep != null ">and excep = #{excep}</if>
+            <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
+        </where>
+
+    </select>
+
     <select id="selectSendstateByCondition" parameterType="com.smartor.domain.ServiceSubtask" resultType="Integer">
         SELECT b.sendstate
         from service_task a

--
Gitblit v1.9.3