From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 3d94602..004417b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -19,12 +19,28 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="orderNo" column="order_no"/>
+        <result property="expertConclusion" column="expert_conclusion"/>
+        <result property="expertName" column="expert_name"/>
+        <result property="expertNo" column="expert_no"/>
+        <result property="expertOpinion" column="expert_opinion"/>
+        <result property="expertTime" column="expert_time"/>
+        <result property="expertType" column="expert_type"/>
+        <result property="status" column="status"/>
     </resultMap>
 
     <sql id="selectServiceEthicalreviewinitiateVo">
         select ID,
                InfoID,
                case_no,
+               order_no,
+               expert_conclusion,
+               expert_name,
+               expert_no,
+               expert_opinion,
+               expert_time,
+               expert_type,
+               status,
                initiate_person,
                start_time,
                end_time,
@@ -51,7 +67,52 @@
             <if test="endTime != null ">and end_time = #{endTime}</if>
             <if test="initiateTheme != null  and initiateTheme != ''">and initiate_theme = #{initiateTheme}</if>
             <if test="cutOffTime != null ">and cut_off_time = #{cutOffTime}</if>
+            <if test="expertConclusion != null ">and expert_conclusion = #{expertConclusion}</if>
+            <if test="orderNo != null ">and order_no = #{orderNo}</if>
+            <if test="expertName != null ">and expert_name = #{expertName}</if>
+            <if test="expertOpinion != null ">and expert_opinion = #{expertOpinion}</if>
+            <if test="expertTime != null ">and expert_time = #{expertTime}</if>
+            <if test="expertType != null ">and expert_type = #{expertType}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="expertNo != null ">and expert_no = #{expertNo}</if>
+
         </where>
     </select>
+    <select id="reviewinitiateBaseInfoList" parameterType="com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO"
+            resultType="com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO">
+        SELECT
+        sd.treatmenthospitalname as treatmenthospitalname,
+        sd.treatmenthospitalno as treatmenthospitalno,
+        sd.DonorNo as donorno,
+        sd.case_no as caseNo,
+        sd.Name as name,
+        sd.RecordState as recordstate,
+        sd.Sex as sex,
+        sd.Age as age,
+        sd.BloodType as bloodtype,
+        sd.idcardno as idcardno,
+        sd.diagnosisname as diagnosisname,
+        se.infoID 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
+        FROM
+        service_donatebaseinfo sd
+        LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0
+        AND se.del_flag = 0
+        <where>
+            <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>
+            <if test="expertName != null ">and se.expert_name = #{expertName}</if>
+            <if test="expertOpinion != null ">and se.expert_opinion = #{expertOpinion}</if>
+            <if test="expertTime != null ">and se.expert_time = #{expertTime}</if>
+            <if test="status != null ">and se.status = #{status}</if>
+        </where>
+        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+    </select>
 
 </mapper>

--
Gitblit v1.9.3