From 4bb2588c5579d43ae5d343c7343a425a80b02d6c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 27 六月 2025 12:12:42 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 2ffd536..5cba952 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -169,7 +169,8 @@
leavehospitaldistrictcode,
leavehospitaldistrictname,
leavediagname,
- leaveicd10code
+ leaveicd10code,
+ visit_type
from service_subtask
</sql>
@@ -186,6 +187,7 @@
<if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">and
leavehospitaldistrictname = #{leavehospitaldistrictname}
</if>
+ <if test="leavediagname != null and leavediagname != ''">and leavediagname like concat('%', #{leavediagname}, '%')</if>
<if test="sex != null and sex != ''">and sex = #{sex}</if>
<if test="age != null ">and age = #{age}</if>
<if test="patguid != null ">and patguid = #{patguid}</if>
@@ -306,8 +308,16 @@
<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
<if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
<if test="visitTime != null">and visit_time = #{visitTime}</if>
- <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
- <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
+ <!--<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
+ <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>-->
+ <if test="visitCount != null and visitCount > 1 and visitDeptCodes != null and visitDeptCodes.size() > 0">
+ AND visit_dept_code IN
+ <foreach collection="visitDeptCodes" item="visitDeptCodes" open="("
+ separator=","
+ close=")">
+ #{visitDeptCodes}
+ </foreach>
+ </if>
</where>
<if test="sort != null and sort==0">order by endtime asc</if>
<if test="sort != null and sort==1">order by endtime desc</if>
@@ -487,7 +497,7 @@
<if test="visitCount != null ">visit_count,</if>
<if test="isVisitAgain != null ">is_visit_again,</if>
<if test="upid != null ">upid,</if>
- <if test="visit_time != null ">visitTime,</if>
+ <if test="visitTime != null ">visit_Time,</if>
<if test="visitDeptCode != null">visit_dept_code,</if>
<if test="visitDeptName != null">visit_dept_name,</if>
</trim>
@@ -952,6 +962,13 @@
#{leavehospitaldistrictcode}
</foreach>
</if>
+ <if test="deptcodes != null and deptcodes.size() > 0">
+ AND deptcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator=","
+ close=")">
+ #{deptcode}
+ </foreach>
+ </if>
<if test="serviceType != null and serviceType.size() > 0">
AND service_type IN
<foreach collection="serviceType" item="serviceType" open="(" separator=","
--
Gitblit v1.9.3