From d3ca49386f33a7db5f9f4c039857a4a200285f20 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 17 十二月 2025 17:02:08 +0800
Subject: [PATCH] 【丽水】增加dateLimit限制，当dateLimit=1时未到随访日期不予展示
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 0979503..ec8996f 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -197,12 +197,16 @@
<include refid="selectServiceSubtaskVo"/>
<where>
del_flag=0
- and taskid = #{taskid}
- AND sendstate IN
- <foreach collection="sendstates" item="sendstate" open="(" separator=","
- close=")">
- #{sendstate}
- </foreach>
+ <if test="taskid != null ">and taskid = #{taskid}</if>
+ <if test="serviceType != null ">and service_type = #{serviceType}</if>
+ <if test="patid != null ">and patid = #{patid}</if>
+ <if test="sendstates!=null">
+ AND sendstate IN
+ <foreach collection="sendstates" item="sendstate" open="(" separator=","
+ close=")">
+ #{sendstate}
+ </foreach>
+ </if>
</where>
</select>
@@ -365,6 +369,7 @@
<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
<if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
+ <if test="dateLimit != null and dateLimit = '1'"> and CURDATE() + 1 > long_send_time</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>-->
@@ -552,6 +557,20 @@
where id = #{id}
</select>
+ <select id="selectServiceSubtaskByDiagname" parameterType="com.smartor.domain.ServiceSubtask"
+ resultMap="ServiceSubtaskResult">
+ select sendstate,starttime,endtime,nurse_name,phone,sex,task_name,sendname,leavediagname,visit_time FROM
+ service_subtask WHERE del_flag=0
+ <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>
+ <if test="sendstate != null">and sendstate = #{sendstate}</if>
+ <if test="orgid != null">and orgid =#{orgid}</if>
+ GROUP BY sendname,sendstate,starttime,endtime,nurse_name,phone,sex,task_name,leavediagname,visit_time ORDER BY
+ visit_time
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+ </select>
+
<insert id="insertServiceSubtask" parameterType="com.smartor.domain.ServiceSubtask" useGeneratedKeys="true"
keyProperty="id">
insert into service_subtask
--
Gitblit v1.9.3