From fd12c3a4d5c0a247c89ab59faba189075a302ffd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 09 六月 2025 18:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index e76a4e5..98673e3 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -79,6 +79,9 @@
<result property="visitCount" column="visit_count"/>
<result property="isVisitAgain" column="is_visit_again"/>
<result property="upid" column="upid"/>
+ <result property="visitTime" column="visit_time"/>
+ <result property="visitDeptName" column="visit_dept_name"/>
+ <result property="visitDeptCode" column="visit_dept_code"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -94,6 +97,9 @@
task_guid,
patfrom,
upid,
+ visit_dept_name,
+ visit_dept_code,
+ visit_time,
inhospid,
visit_count,
is_visit_again,
@@ -163,7 +169,8 @@
leavehospitaldistrictcode,
leavehospitaldistrictname,
leavediagname,
- leaveicd10code
+ leaveicd10code,
+ visit_type
from service_subtask
</sql>
@@ -287,11 +294,11 @@
<if test="excep != null ">and excep = #{excep}</if>
<if test="nurseName != null ">and nurse_name = #{nurseName}</if>
<if test="score != null">and score = #{score}</if>
-<!-- <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
- <if test="visit_count_flag != null and visit_count_flag == 0">
+ <!-- <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
+ <if test="visitCount != null and visitCount == 1">
AND visit_count = 1
</if>
- <if test="visit_count_flag != null and visit_count_flag == 1">
+ <if test="visitCount != null and visitCount > 1">
AND visit_count > 1
</if>
<if test="remark != null">and remark = #{remark}</if>
@@ -299,6 +306,17 @@
<if test="createBy != null">and create_by = #{createBy}</if>
<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="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>
@@ -325,6 +343,8 @@
<if test="upid != null ">and upid = #{upid}</if>
<if test="visitCount != null ">and visit_count = #{visitCount}</if>
<if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if>
+ <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
+ <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
</where>
</select>
@@ -376,6 +396,9 @@
<if test="endtime != null ">and endtime = #{endtime}</if>
<if test="excep != null ">and excep = #{excep}</if>
<if test="nurseName != null ">and nurse_name = #{nurseName}</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>
</where>
</select>
@@ -473,6 +496,9 @@
<if test="visitCount != null ">visit_count,</if>
<if test="isVisitAgain != null ">is_visit_again,</if>
<if test="upid != null ">upid,</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>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -551,6 +577,9 @@
<if test="visitCount != null ">#{visitCount},</if>
<if test="isVisitAgain != null ">#{isVisitAgain},</if>
<if test="upid != null ">#{upid},</if>
+ <if test="visitTime != null ">#{visitTime},</if>
+ <if test="visitDeptCode != null">#{visitDeptCode},</if>
+ <if test="visitDeptName != null">#{visitDeptName},</if>
</trim>
</insert>
@@ -634,6 +663,9 @@
<if test="visitCount != null ">visit_count=#{visitCount},</if>
<if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
+ <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+ <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
</trim>
where id = #{id}
</update>
@@ -718,6 +750,9 @@
<if test="patguid != null ">patguid=#{patguid},</if>
<if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
+ <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+ <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
</trim>
<where>
<if test="patid != null ">and patid = #{patid}</if>
@@ -804,6 +839,9 @@
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
<if test="patguid != null ">patguid=#{patguid},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
+ <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+ <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -887,6 +925,9 @@
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
<if test="patguid != null ">patguid=#{patguid},</if>
<if test="upid != null ">upid=#{upid},</if>
+ <if test="visitTime != null ">visit_time=#{visitTime},</if>
+ <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+ <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
</trim>
where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
@@ -920,6 +961,13 @@
#{leavehospitaldistrictcode}
</foreach>
</if>
+ <if test="deptcodes != null and deptcodes.size() > 0">
+ AND leavehospitaldistrictcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
<if test="serviceType != null and serviceType.size() > 0">
AND service_type IN
<foreach collection="serviceType" item="serviceType" open="(" separator=","
@@ -931,6 +979,8 @@
AND endtime > #{startTime}
AND endtime <= #{endTime}
</if>
+ <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
+ <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
</where>
</select>
@@ -949,6 +999,7 @@
senderdetail,
type,
taskid,
+ visit_time,
templateid,
templatename,
senddate,
@@ -1005,6 +1056,8 @@
task_guid,
leavediagname,
patguid,
+ visitDeptCode,
+ visitDeptName,
leaveicd10code
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
--
Gitblit v1.9.3