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/ServiceDonatebaseinfoMapper.xml |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index bd323c2..a7355d1 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -91,6 +91,11 @@
         <result property="gcsScore" column="gcs_score"/>
         <result property="coordinatorNo" column="coordinator_no"/>
         <result property="coordinatorName" column="coordinator_name"/>
+        <result property="terminationResult" column="termination_result"/>
+        <result property="reportHospital" column="report_hospital"/>
+        <result property="currentHospital" column="current_hospital"/>
+        <result property="terminationType" column="termination_type"/>
+        <result property="extracontent" column="extracontent"/>
     </resultMap>
 
     <sql id="selectServiceDonatebaseinfoVo">
@@ -415,10 +420,16 @@
         sd.treatmenthospitalno AS treatmenthospitalno,
         sd.DonorNo AS donorno,
         sd.id AS id,
+        sd.InpatientNo AS inpatientNo,
         sd.case_no AS caseNo,
         sd.NAME AS NAME,
         sd.RecordState AS recordstate,
+        sd.termination_case AS terminationCase,
+        sd.termination_type AS terminationType,
+        sd.termination_result AS terminationResult,
         sd.workflow AS workflow,
+        sd.Infectious AS infectious,
+        sd.Infectious_other AS infectiousOther,
         sd.Sex AS sex,
         sd.Age AS age,
         sd.BloodType AS bloodtype,
@@ -426,8 +437,8 @@
         sd.ReportTime AS reportTime,
         sd.coordinator_no AS coordinatorNo,
         sd.coordinator_name AS coordinatorName,
-        sd.termination_case AS terminationCase,
         sd.diagnosisname AS diagnosisname,
+        sd.extracontent AS extracontent,
         sm.assess_state AS assessState,-- 璇勪及鐘舵��
         sm.assess_time AS assessTime,-- 璇勪及鏃堕棿
         sr.SignDate AS signDate,-- 浜插睘纭鏃堕棿
@@ -450,13 +461,21 @@
         AND sdt.del_flag = 0 -- 瀹屾垚鐧昏
 
         <where>sd.del_flag = 0
-            <if test="name != null ">AND sd.Name >= #{name}</if>
+            <if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if>
+            <if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if>
+            <if test="name != null ">AND sd.Name = #{name}</if>
+            <if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if>
+            <if test="startAge != null">AND sd.age &gt;= #{startAge}</if>
+            <if test="endAge !=null">AND sd.age &lt;= #{endAge}
+            </if>
             <if test="idcardno != null  and idcardno != ''">and IDCardNo = #{idcardno}</if>
             <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if>
             <if test="workflow != null">and sd.workflow = #{workflow}</if>
+            <if test="diagnosisName != null">and sd.DiagnosisName like concat('%', #{diagnosisName}, '%')</if>
         </where>
 
         ORDER BY sd.ReportTime DESC
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+
     </select>
 </mapper>

--
Gitblit v1.9.3