From 2a3af1e765722cae585967c0010d90acef077aee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 25 五月 2026 17:41:54 +0800
Subject: [PATCH] 捐献基础表新增归档时间 捐献亲属确认表新增其他亲属 供体维护记录新增住院号排序，新增年龄区间、入院区间，协调员查询 捐献亲属确认修改住院号排序 医学评估表新增住院号排序，新增评估时间区间查询 患者死亡信息增住院号排序，新增死亡时间区间查询 伦理审查发起表增住院号排序，新增发起时间区间查询 捐献器官分配基础表表增住院号排序，新增分配状态，分配时间区间查询 捐献完成表增住院号排序，新增分配状态查询
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index 68024d7..a44a591 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -63,7 +63,9 @@
sdm.item_name as itemName,
sdm.item_time as itemTime,
sdt.DeathTime as deathTime,
- sdm.item_desc as itemDesc
+ sdm.item_desc as itemDesc,
+ sdm.state,
+ entry_time
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatemaintenance sdm ON sd.ID = sdm.InfoID
@@ -77,16 +79,21 @@
<if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
<if test="caseNo != null and caseNo != ''">and case_no = #{caseNo}</if>
<if test="reportTime != null ">and ReportTime = #{reportTime}</if>
+ <if test="startEntryTime != null and endEntryTime != null ">and entry_time BETWEEN #{startEntryTime} and #{endEntryTime}</if>
+ <if test="startAge != null and endAge != null ">and age BETWEEN #{startAge} and #{endAge}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
- <if test="name != null and name != ''">and name = #{name}</if>
- <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name = #{coordinatorName}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name like concat('%', #{coordinatorName}, '%')</if>
<if test="itemNo != null and itemNo != ''">and item_no = #{itemNo}</if>
<if test="itemName != null and itemName != ''">and item_name like concat('%', #{itemName}, '%')</if>
<if test="itemTime != null ">and item_time = #{itemTime}</if>
<if test="itemDesc != null and itemDesc != ''">and item_desc = #{itemDesc}</if>
<if test="id != null ">and sdt.id = #{id}</if>
+ <if test="state != null and state != ''">and sdm.state = #{state}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+
</select>
</mapper>
--
Gitblit v1.9.3