From d75a864b57bdc147e044fad256d640e4ff3bd0bb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 十二月 2025 17:01:05 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 3c78bbc..8edb45a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -43,11 +43,21 @@
         <result property="organdonation" column="OrganDonation"/>
         <result property="organdonationOther" column="OrganDonation_Other"/>
         <result property="donationcategory" column="DonationCategory"/>
+        <result property="coordinatorInOperating" column="coordinator_in_operating"/>
+        <result property="coordinatorOutOperating" column="coordinator_out_operating"/>
+        <result property="coordinatorSign" column="coordinator_sign"/>
+        <result property="coordinatorSignTime" column="coordinator_sign_time"/>
+        <result property="donateHospital" column="donate_hospital"/>
     </resultMap>
 
     <sql id="selectServiceDonationwitnessVo">
         select ID,
                InfoID,
+               donate_hospital,
+               coordinator_in_operating,
+               coordinator_out_operating,
+               coordinator_sign,
+               coordinator_sign_time,
                DonorNo,
                GainHospitalNo,
                GainHospitalName,
@@ -92,10 +102,12 @@
         <include refid="selectServiceDonationwitnessVo"/>
         <where>
             <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
+            <if test="donateHospital != null  and donateHospital != ''">and donate_hospital = #{donateHospital}</if>
             <if test="gainhospitalname != null  and gainhospitalname != ''">and GainHospitalName like concat('%',
                 #{gainhospitalname}, '%')
             </if>
             <if test="operationdoctor != null  and operationdoctor != ''">and OperationDoctor = #{operationdoctor}</if>
+            <if test="infoid != null">and InfoID = #{infoid}</if>
         </where>
     </select>
 
@@ -121,6 +133,7 @@
         `service_donatebaseinfo`.`create_by` AS `basecreateby`,
         `service_donatebaseinfo`.`workflow` AS `workflow`,
         `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
+        `service_donatebaseinfo`.`donatetime` AS `donatetime`,
         `service_donationwitness`.`ID` AS `dwID`,
         `service_donationwitness`.`InfoID` AS `InfoID`,
         `service_donationwitness`.`DonorNo` AS `dwDonorNo`,
@@ -158,17 +171,21 @@
         `service_donationwitness`.`create_by` AS `createby`,
         `service_donationwitness`.`create_time` AS `createtime`,
         `service_donationwitness`.`update_by` AS `updateby`,
-        `service_donationwitness`.`update_time` AS `updatetime`
+        `service_donationwitness`.`update_time` AS `updatetime`,
+        `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`,
+        `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`,
+        `service_donationwitness`.`coordinator_sign` AS `coordinatorSign`,
+        `service_donationwitness`.`coordinator_sign_time` AS `coordinatorSignTime`
+        `service_donationwitness`.`donate_hospital` AS `donate_hospital`
         FROM
-
         `service_donatebaseinfo`
         LEFT JOIN `service_donationwitness` ON
         `service_donatebaseinfo`.`ID` = `service_donationwitness`.`InfoID`
         LEFT JOIN `base_organization` ON
         `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
-
         <where>
             service_donationwitness.del_flag=0
+            and service_donatebaseinfo.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>
@@ -252,6 +269,7 @@
             w.del_flag=0
             and b.del_flag=0
             <if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
+            <if test="donateHospital != null ">and w.donate_hospital >= #{donateHospital}</if>
             <if test="endtime != null ">and w.OperationBegTime &lt;= #{endtime}</if>
             <if test="city != null and city != ''">and o.City = #{city}</if>
             <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
@@ -270,4 +288,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3