From 4c141764d64c37c4c27e372cd55d9e861b192c28 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 18:06:49 +0800
Subject: [PATCH] 捐献基础增加入院时间,捐献上报基础增加入院时间

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index a7355d1..6077521 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">
@@ -242,7 +243,7 @@
         </where>
 
         order by ReportTime desc
-
+        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 
     <select id="getDonateNumberById" resultType="java.lang.String">
@@ -463,7 +464,7 @@
         <where>sd.del_flag = 0
             <if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if>
             <if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if>
-            <if test="name != null ">AND sd.Name = #{name}</if>
+            <if test="name != null ">AND sd.Name like concat('%', #{name}, '%')</if>
             <if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if>
             <if test="startAge != null">AND sd.age &gt;= #{startAge}</if>
             <if test="endAge !=null">AND sd.age &lt;= #{endAge}
@@ -478,4 +479,34 @@
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
 
     </select>
+    <select id="totalConfirmationBaseInfo" resultType="Map">
+        SELECT  recordstate AS recordState, count(recordstate) AS stateCount
+        FROM service_donatebaseinfo sd
+        LEFT JOIN service_medicalevaluation sm ON sd.ID = sm.InfoID
+        AND sm.del_flag = 0 -- 鎹愮尞璇勪及
+        LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID
+        AND sr.del_flag = 0-- 鎹愮尞纭
+        LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID
+        AND se.del_flag = 0-- 浼︾悊瀹℃煡
+        LEFT JOIN service_donationwitness sdw ON sd.ID = sdw.InfoID
+        AND sdw.del_flag = 0-- 鑾峰彇瑙佽瘉
+        LEFT JOIN service_donatecompletioninfo sdt ON sd.ID = sdt.InfoID
+        AND sdt.del_flag = 0 -- 瀹屾垚鐧昏
+
+        <where>sd.del_flag = 0
+            <if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if>
+            <if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if>
+            <if test="name != null ">AND sd.Name like concat('%', #{name}, '%')</if>
+            <if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if>
+            <if test="startAge != null">AND sd.age &gt;= #{startAge}</if>
+            <if test="endAge !=null">AND sd.age &lt;= #{endAge}
+            </if>
+            <if test="idcardno != null  and idcardno != ''">and IDCardNo = #{idcardno}</if>
+            <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if>
+            <if test="workflow != null">and sd.workflow = #{workflow}</if>
+            <if test="diagnosisName != null">and sd.DiagnosisName like concat('%', #{diagnosisName}, '%')</if>
+        </where>
+        GROUP BY recordstate
+    </select>
+
 </mapper>

--
Gitblit v1.9.3