From 70a8659a911f9036f25e47552679e8cb9c80d5b2 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 25 四月 2026 10:13:35 +0800
Subject: [PATCH] 捐献器官分配附件处理
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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..7b7e3d4 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="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
<if test="treatmenthospitalname != null and treatmenthospitalname != ''">and sd.treatmenthospitalname like
concat('%', #{treatmenthospitalname}, '%')
</if>
--
Gitblit v1.9.3