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/ServiceDonateorganBaseMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
index f3c072d..53557ef 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
@@ -33,7 +33,10 @@
create_time,
update_by,
update_time,
- EstimatedTime
+ EstimatedTime,
+ recordstate,
+ file_name,
+ ext_content
from service_donateorgan_base
</sql>
@@ -61,7 +64,10 @@
sd.treatmenthospitalname AS treatmenthospitalname,
sd.treatmenthospitalno AS treatmenthospitalno,
sd.DonorNo AS donorno,
+ sd.DonationCategory as donationcategory,
sd.case_no AS caseNo,
+ sd.extracontent AS extracontent,
+ sd.InpatientNo AS inpatientno,
sd.Name AS NAME,
sd.Sex AS sex,
sd.Age AS age,
@@ -70,16 +76,29 @@
sd.diagnosisname AS diagnosisname,
sd.id AS infoid,
sdb.ID AS id,
- sdb.registration_name AS registrationName,
- sdb.registration_time AS registrationTime,
- sdb.registration_code AS registrationCode
+ sdb.allocation_status,
+ sdb.allocation_time,
+ sdb.registration_code,
+ sdb.registration_name,
+ sdb.registration_time,
+ sdb.create_by,
+ sdb.create_time,
+ sdb.update_by,
+ sdb.update_time,
+ sdb.EstimatedTime as EstimatedTime,
+ sdb.recordstate as recordstate,
+ sdb.file_name,
+ sdb.ext_content
FROM
service_donatebaseinfo sd
LEFT JOIN service_donateorgan_base sdb ON sd.ID = sdb.InfoID and sd.del_flag = 0
and sdb.del_flag = 0
+ and sdb.ID is not null
<where>
-
+ sd.termination_case = 0
<if test="donorno != null and donorno != ''">and sd.DonorNo = #{donorno}</if>
+ <if test="infoid != null ">and sd.ID = #{infoid}</if>
+
<if test="treatmenthospitalname != null and treatmenthospitalname != ''">and sd.treatmenthospitalname like
concat('%', #{treatmenthospitalname}, '%')
</if>
@@ -102,7 +121,12 @@
<if test="registrationCode != null and registrationCode != ''">
and sdb.registration_code = #{registrationCode}
</if>
+ <if test="allocationStatus != null and allocationStatus != ''">
+ and sdb.allocation_status = #{allocationStatus}
+ </if>
+ <if test="startTime != null and endTime != null ">and sdb.allocation_time BETWEEN #{startTime} and #{endTime}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3