From 4da424d7a48976c940d9012f5b1d3e178c273773 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 七月 2025 09:34:15 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index d7f4e90..c0d8a35 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -81,6 +81,10 @@
         <result property="workflow" column="workflow"/>
         <result property="donatetime" column="donatetime"/>
         <result property="donateno" column="donateno"/>
+        <result property="currentMedicalInstitution" column="current_medical_institution"/>
+        <result property="firstMedicalInstitution" column="first_medical_institution"/>
+        <result property="currentDept" column="current_dept"/>
+        <result property="firstDept" column="first_dept"/>
     </resultMap>
 
     <sql id="selectServiceDonatebaseinfoVo">
@@ -112,6 +116,9 @@
             </if>
             <if test="residenceprovince != null  and residenceprovince != ''">and ResidenceProvince =
                 #{residenceprovince}
+            </if>
+            <if test="terminationCase != null">and termination_case =
+                #{terminationCase}
             </if>
             <if test="residenceprovincename != null  and residenceprovincename != ''">and ResidenceProvinceName like
                 concat('%', #{residenceprovincename}, '%')
@@ -203,8 +210,8 @@
             <if test="infoname != null ">and infoName = #{infoname}</if>
             <if test="infophone != null ">and infoPhone = #{infophone}</if>
             <if test="createBy != null ">and `service_donatebaseinfo`.create_by = #{createBy}</if>
-            <if test="starttime != null ">and ReportTime >= #{starttime}</if>
-            <if test="endtime != null ">and ReportTime &lt;= #{endtime}</if>
+            <if test="starttime != null ">and donatetime >= #{starttime}</if>
+            <if test="endtime != null ">and donatetime &lt;= #{endtime}</if>
             <if test="nativeplace != null  and nativeplace != ''">and NativePlace = #{nativeplace}</if>
             <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
             <if test="deptid != null ">and deptid = #{deptid}</if>
@@ -238,8 +245,8 @@
         inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         <where>
             AND b.del_flag=0
-            <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
-            <if test="endtime != null ">and b.ReportTime &lt;= #{endtime}</if>
+            <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+            <if test="endtime != null ">and b.donatetime &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>
         </where>
@@ -386,4 +393,4 @@
           AND d.OrganGetTime &lt;= #{endtime}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3