From c6461ee45e27ad7f6f1a89d5aab103fbab6e79d3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 四月 2025 17:58:17 +0800
Subject: [PATCH] 代码提交

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 31ad4c5..e518734 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -273,11 +273,11 @@
             <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 = #{drcode}</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="nurseId != null ">and nurse_id = #{nurseId}</if>
             <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
             <if test="score != null">and score = #{score}</if>
             <if test="remark != null">and remark = #{remark}</if>

--
Gitblit v1.9.3