From cbd223ee2185f2cc39267e37a72edaadf6a3aa19 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 18 三月 2026 08:57:12 +0800
Subject: [PATCH] 死亡判定相关接口新增死亡判定说明、扩展 器官分配相关接口新增记录状态、附件、扩展 器官获取相关接口新增附件、扩展 新开发去态查询API接口

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
index ac37a5e..218707c 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,14 +64,17 @@
         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,
         sd.BloodType AS bloodtype,
         sd.idcardno AS idcardno,
         sd.diagnosisname AS diagnosisname,
-        sdb.infoID AS infoid,
+        sd.id AS infoid,
         sdb.ID AS id,
         sdb.registration_name AS registrationName,
         sdb.registration_time AS registrationTime,
@@ -77,9 +83,12 @@
         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