From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml | 7 +++++--
1 files changed, 5 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 004417b..0964082 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -83,6 +83,7 @@
SELECT
sd.treatmenthospitalname as treatmenthospitalname,
sd.treatmenthospitalno as treatmenthospitalno,
+ sd.DonationCategory as donationcategory,
sd.DonorNo as donorno,
sd.case_no as caseNo,
sd.Name as name,
@@ -92,7 +93,7 @@
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,
@@ -102,8 +103,10 @@
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>
+ sd.termination_case = 0
+
<if test="infoid != null ">and se.InfoID = #{infoid}</if>
<if test="caseNo != null and caseNo != ''">and sd.case_no = #{caseNo}</if>
<if test="expertConclusion != null ">and se.expert_conclusion = #{expertConclusion}</if>
--
Gitblit v1.9.3