From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 5647acb..7d40f97 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -83,7 +83,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,
@@ -102,9 +105,11 @@
         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