From c309ec6868bf937529e8e3ff948dbdedd66e5631 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 27 三月 2026 15:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c28555d..4ee05b9 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -361,6 +361,41 @@
</foreach>
</if>
</if>
+ <if test="deptOrDistrict==3">
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND (leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+ separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
+ and visit_dept_code IN
+ <foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
+ close="))">
+ #{visitDeptCode}
+ </foreach>
+ </if>
+ </if>
+
+ <if test="deptOrDistrict==4">
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND (leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+ separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
+ OR visit_dept_code IN
+ <foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
+ close="))">
+ #{visitDeptCode}
+ </foreach>
+ </if>
+ </if>
<if test="visitTime != null">
AND date_format(visit_time,'%y%m%d') = date_format(#{visitTime},'%y%m%d')
@@ -425,8 +460,8 @@
</if>
<if test="sort != null and sort==0">order by endtime asc</if>
<if test="sort != null and sort==1">order by endtime desc</if>
- <if test="sort != null and sort==2">order by long_send_time asc</if>
- <if test="sort != null and sort==3">order by long_send_time desc</if>
+ <if test="sort != null and sort==2">order by visit_time asc</if>
+ <if test="sort != null and sort==3">order by visit_time desc</if>
<if test="sort != null and sort==5">order by admindate asc</if>
<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>
@@ -1859,6 +1894,9 @@
FROM service_subtask
WHERE DATE_FORMAT(finishtime, '%Y-%m-%d') >= #{startDate}
AND DATE_FORMAT(finishtime, '%Y-%m-%d') <= #{endDate}
+ <if test="orgid != null">
+ AND orgid = #{orgid}
+ </if>
GROUP BY deptname
</select>
@@ -2201,6 +2239,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