From 38481ffde1ad9d9cd6cd3cc73c66babc18eabe63 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 03 四月 2026 15:48:14 +0800
Subject: [PATCH] 【丽水】历史随访 selectServiceSubtaskByDiagname 不查宣教数据
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 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..6ed0dce 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,12 +460,13 @@
</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>
<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"
@@ -615,6 +651,12 @@
</if>
<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
<if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
+ <if test="visitCount != null and visitCount == 1">
+ AND visit_count = 1
+ </if>
+ <if test="visitCount != null and visitCount > 1">
+ AND visit_count > 1
+ </if>
<if test="groupKey != null and groupKey != ''">
AND ${groupKey} IN
<foreach collection="groupKeyList" item="key" open="(" separator=","
@@ -667,6 +709,7 @@
resultMap="ServiceSubtaskResult">
select sendstate,starttime,endtime,nurse_name,phone,sex,task_name,sendname,leavediagname,visit_time FROM
service_subtask WHERE del_flag=0
+ and service_type != 4
<if test="leavediagname != null">and leavediagname like concat('%',#{leavediagname}, '%')</if>
<if test="sendname != null">and sendname like concat('%',#{sendname}, '%')</if>
<if test="taskName != null">and task_name like concat('%',#{taskName}, '%')</if>
@@ -1357,6 +1400,12 @@
<if test="type != null">
and type = #{type}
</if>
+ <if test="visitCount != null and visitCount == 1">
+ AND visit_count = 1
+ </if>
+ <if test="visitCount != null and visitCount > 1">
+ AND visit_count > 1
+ </if>
<if test="groupKey != null and groupKey != '' and groupKeyList != null and groupKeyList.size>0">
AND ${groupKey} IN
<foreach collection="groupKeyList" item="key" open="(" separator=","
@@ -1412,6 +1461,12 @@
<!-- 鐩墠鍙粺璁¤闊冲拰闂嵎 -->
<if test="type != null">
and type = #{type}
+ </if>
+ <if test="visitCount != null and visitCount == 1">
+ AND visit_count = 1
+ </if>
+ <if test="visitCount != null and visitCount > 1">
+ AND visit_count > 1
</if>
<if test="groupKey != null and groupKey != ''">
group by ${groupKey}
@@ -1859,6 +1914,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 +2259,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