From 05859cb2b3f8a2faaeef18a24f5aae6c5e1b904d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 21 九月 2026 14:28:55 +0800
Subject: [PATCH] 在捐献、已获取、案例完成  状态连动保存

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 0c66ac5..6d08453 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -158,7 +158,9 @@
         st.OrganDonation_Other as organdonationOther,
         st.DonationCategory as donationcategory,
         st.DeathJudgeAnnex as deathjudgeannex,
-        st.witness_state as witnessState
+        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
@@ -177,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>
 
@@ -284,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>
@@ -294,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>
@@ -305,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>
@@ -334,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