From 63b95a545b17b5efdfcfc902f129d354600c44ab Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 21 九月 2026 10:52:41 +0800
Subject: [PATCH] 驾驶舱相关统计修改

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index 5d97133..a223c09 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -96,6 +96,7 @@
         <result property="currentHospital" column="current_hospital"/>
         <result property="terminationType" column="termination_type"/>
         <result property="extracontent" column="extracontent"/>
+        <result property="entryTime" column="entry_time"/>
     </resultMap>
 
     <sql id="selectServiceDonatebaseinfoVo">
@@ -259,7 +260,7 @@
     </select>
     <select id="getDonateBaseCountThisYear" resultType="java.lang.Integer">
         select count(*) from service_donatebaseinfo b
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         <where>
             AND b.del_flag=0
             <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
@@ -299,7 +300,7 @@
     </select>
     <select id="getAllDonateBaseInfoByTime" resultType="com.ruoyi.project.domain.ServiceDonatebaseinfo">
         select * from service_donatebaseinfo b
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         <where>
             <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
             <if test="caseNo != null ">and b.case_no >= #{caseNo}</if>
@@ -349,21 +350,21 @@
     <select id="getDistrictDonate" resultType="java.lang.String">
         select o.city
         from service_donatebaseinfo b
-                 inner join base_organization o on o.organizationid = b.treatmenthospitalno
+                 left join base_organization o on o.organizationid = b.treatmenthospitalno
         where (b.RecordState = '0' or b.RecordState = '1' or b.RecordState = '2')
     </select>
     <select id="getDistrictComplete" resultType="java.lang.String">
         select o.city
         from service_donatebaseinfo b
                  inner join service_donatecompletioninfo d on d.infoid = b.id
-                 inner join base_organization o on o.organizationid = b.treatmenthospitalno
+                 left join base_organization o on o.organizationid = b.treatmenthospitalno
         where d.CompleteTime > 0
     </select>
     <select id="getDistrictOrgans" resultType="java.lang.String">
         select o.city
         from service_donatebaseinfo b
                  inner join service_donateorgan d on d.infoid = b.id
-                 inner join base_organization o on o.organizationid = b.treatmenthospitalno
+                 left join base_organization o on o.organizationid = b.treatmenthospitalno
         where d.OrganGetTime > 0
     </select>
     <select id="getDonateNameById" resultType="java.lang.String">
@@ -375,7 +376,7 @@
     <select id="getDistrictDonateByTime" resultType="java.lang.String">
         select o.city
         from service_donatebaseinfo b
-                 inner join base_organization o on o.organizationid = b.treatmenthospitalno
+                 left join base_organization o on o.organizationid = b.treatmenthospitalno
         where (b.RecordState = '0' or b.RecordState = '1' or b.RecordState = '2')
           and b.ReportTime >= #{starttime}
           and b.ReportTime &lt;= #{endtime}
@@ -384,7 +385,7 @@
         select o.city
         from service_donatebaseinfo b
                  inner join service_donatecompletioninfo d on d.infoid = b.id
-                 inner join base_organization o on o.organizationid = b.treatmenthospitalno
+                 left join base_organization o on o.organizationid = b.treatmenthospitalno
         where d.del_flag = 0
           and d.CompleteTime >= #{starttime}
           and d.CompleteTime &lt;= #{endtime}
@@ -393,7 +394,7 @@
     <select id="gettreatmenthospitalnoCompleteByTime" resultType="java.lang.String">
         select b.treatmenthospitalno from service_donatebaseinfo b
         inner join service_donatecompletioninfo d on d.infoid=b.id
-        inner join base_organization o on o.organizationid=b.treatmenthospitalno
+        left join base_organization o on o.organizationid=b.treatmenthospitalno
         <where>
             d.del_flag=0
             <if test="starttime != null ">and d.CompleteTime >= #{starttime}</if>
@@ -408,7 +409,7 @@
         select o.city
         from service_donatebaseinfo b
                  inner join service_donateorgan d on d.infoid = b.id
-                 inner join base_organization o on o.organizationid = b.treatmenthospitalno
+                 left join base_organization o on o.organizationid = b.treatmenthospitalno
         WHERE d.del_flag = 0
           AND d.OrganGetTime IS NOT NULL
           AND d.OrganGetTime >= #{starttime}

--
Gitblit v1.9.3