From c9cf721bb193b89083cddb8a8a92e46ca3d95cc8 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 15:35:15 +0800
Subject: [PATCH] 伦理审查基本信息集合新增附件

---
 ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 004417b..ee257e0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -27,6 +27,7 @@
         <result property="expertTime" column="expert_time"/>
         <result property="expertType" column="expert_type"/>
         <result property="status" column="status"/>
+        <result property="filePatch" column="file_patch"/>
     </resultMap>
 
     <sql id="selectServiceEthicalreviewinitiateVo">
@@ -83,7 +84,10 @@
         SELECT
         sd.treatmenthospitalname as treatmenthospitalname,
         sd.treatmenthospitalno as treatmenthospitalno,
+        sd.DonationCategory as donationcategory,
         sd.DonorNo as donorno,
+        sd.extracontent as extracontent,
+        sd.InpatientNo as inpatientno,
         sd.case_no as caseNo,
         sd.Name as name,
         sd.RecordState as recordstate,
@@ -92,19 +96,22 @@
         sd.BloodType as bloodtype,
         sd.idcardno as idcardno,
         sd.diagnosisname as diagnosisname,
-        se.infoID as infoid,
+        sd.id AS infoid,
         se.ID as id,
         se.expert_conclusion as expertConclusion,
         se.expert_name as expertName,
         se.expert_opinion as expertOpinion,
         se.expert_time as expertTime,
-        se.status as status
+        se.status as status,
+        se.file_patch as filePatch
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0
-        AND se.del_flag = 0
+        AND se.del_flag = 0 and se.ID is not null
         <where>
-            <if test="infoid != null ">and se.InfoID = #{infoid}</if>
+            sd.termination_case = 0
+            <if test="infoid != null ">and sd.id = #{infoid}</if>
+            <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
             <if test="caseNo != null  and caseNo != ''">and sd.case_no = #{caseNo}</if>
             <if test="expertConclusion != null ">and se.expert_conclusion = #{expertConclusion}</if>
             <if test="expertName != null ">and se.expert_name = #{expertName}</if>

--
Gitblit v1.9.3