From 2712f20cb96e50fb2849d6dc6ef34d25ddfaf9e8 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 21 九月 2026 16:45:44 +0800
Subject: [PATCH] 捐献器官统计明细列表

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index a27acad..6d08453 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -47,6 +47,8 @@
         <result property="coordinatorOutOperating" column="coordinator_out_operating"/>
         <result property="coordinatorSign" column="coordinator_sign"/>
         <result property="coordinatorSignTime" column="coordinator_sign_time"/>
+        <result property="witnessState" column="witness_state"/>
+
     </resultMap>
 
     <sql id="selectServiceDonationwitnessVo">
@@ -91,7 +93,8 @@
                update_time,
                OrganDonation,
                OrganDonation_Other,
-               DonationCategory
+               donationcategory,
+               witness_state
         from service_donationwitness
     </sql>
 
@@ -153,7 +156,11 @@
         st.AortaPerfusionTime as aortaperfusiontime,
         st.OrganDonation as organdonation,
         st.OrganDonation_Other as organdonationOther,
-        st.DonationCategory as donationcategory
+        st.DonationCategory as donationcategory,
+        st.DeathJudgeAnnex as deathjudgeannex,
+        st.witness_state as witnessState,
+        st.IsSpendRemember as isspendremember,
+        st.IsRestoreRemains as isrestoreremains
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
@@ -172,7 +179,9 @@
             <if test="operationdoctor != null  and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}
             </if>
             <if test="infoid != null">and sd.ID = #{infoid}</if>
+            <if test="witnessState != null">and st.witness_state = #{witnessState}</if>
         </where>
+        order by sd.InpatientNo desc
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 
@@ -279,7 +288,7 @@
     <select id="getDBDDonaterNumberThisYear" resultType="java.lang.Integer">
         select count(*) from service_donationwitness w
         inner join service_donatebaseinfo b on w.InfoID = b.id
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where w.DonationCategory = "DBD"
         <if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
         <if test="endtime != null ">and w.OperationBegTime &lt;= #{endtime}</if>
@@ -289,7 +298,7 @@
     <select id="getDCDDonaterNumberThisYear" resultType="java.lang.Integer">
         select count(*) from service_donationwitness w
         inner join service_donatebaseinfo b on w.InfoID = b.id
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where w.DonationCategory = "DCD"
         <if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
         <if test="endtime != null ">and w.OperationBegTime &lt;= #{endtime}</if>
@@ -300,7 +309,7 @@
     <select id="getDBCDDonaterNumberThisYear" resultType="java.lang.Integer">
         select count(*) from service_donationwitness w
         inner join service_donatebaseinfo b on w.InfoID = b.id
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where w.DonationCategory = "DBCD"
         <if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
         <if test="endtime != null ">and w.OperationBegTime &lt;= #{endtime}</if>
@@ -329,7 +338,7 @@
     <select id="countThisYearByTime" resultType="java.lang.Integer">
         select count(*) from service_donationwitness w
         inner join service_donatebaseinfo b on w.InfoID = b.id
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         <where>
             w.del_flag=0
             and b.del_flag=0

--
Gitblit v1.9.3