From 0d45c29b4d4b043342f39a9a03fb0cc8162f4ef7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 19 五月 2026 10:15:29 +0800
Subject: [PATCH] 新增InfoID获取伦理审查发起详细信息挡口,获取捐献工作流新增7个状态字段数据

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index 7a6a1ee..d838f25 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -141,20 +141,23 @@
         service_ethicalreviewopinions.start_time,
         service_ethicalreviewopinions.end_time,
         service_ethicalreviewopinions.expert_type,
+        c.file_patch,
         service_ethicalreviewopinions.sigin as sigin
         FROM   service_donatebaseinfo
         LEFT JOIN  service_ethicalreviewopinions
         ON service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
         LEFT JOIN base_organization ON
         base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
-
+        left join service_ethicalreviewinitiate c on c.InfoID=service_donatebaseinfo.id
         <where>
             service_donatebaseinfo.del_flag=0
             and service_ethicalreviewopinions.del_flag=0
             <if test="donorno != null  and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
-            <if test="name != null  and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
+            <if test="name != null  and name != ''">
+            and (`service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')  or `service_donatebaseinfo`.`InpatientNo` like concat('%', #{name}, '%'))
             </if>
             <if test="idcardno != null  and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
+            <if test="inpatientno != null  and inpatientno != ''">and `service_donatebaseinfo`.`InpatientNo` = #{inpatientno}</if>
             <if test="treatmenthospitalno != null  and treatmenthospitalno != ''">and
                 `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
             </if>

--
Gitblit v1.9.3