From c18e2ce981ffc347956771c1a7ea0de722344fb2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 02 四月 2026 17:09:24 +0800
Subject: [PATCH] 【丽水】患者出入院时间报错问题处理

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |    7 +++++++
 1 files changed, 7 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..24990ba 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"
@@ -1894,6 +1895,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 +2240,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