From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index e7c7910..c5bf61e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -6,6 +6,7 @@
 
     <resultMap type="com.ruoyi.project.domain.ServiceDonateorgan" id="ServiceDonateorganResult">
         <result property="id" column="ID"/>
+        <result property="baseId" column="base_id"/>
         <result property="infoid" column="InfoID"/>
         <result property="donorno" column="DonorNo"/>
         <result property="organno" column="OrganNo"/>
@@ -29,7 +30,7 @@
         <result property="ispathogenpositive" column="IsPathogenPositive"/>
         <result property="ispnf" column="IsPNF"/>
         <result property="isdgf" column="IsDGF"/>
-        <result property="del_flag" column="del_flag"/>
+        <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -74,6 +75,7 @@
 
     <sql id="selectServiceDonateorganVo">
         select ID,
+               base_id,
                InfoID,
                DonorNo,
                OrganNo,
@@ -148,7 +150,9 @@
             resultMap="ServiceDonateorganResult">
         <include refid="selectServiceDonateorganVo"/>
         <where>
+            del_flag=0
             <if test="infoid != null ">and InfoID = #{infoid}</if>
+            <if test="baseId != null ">and base_id = #{baseId}</if>
             <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
             <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
             <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
@@ -535,7 +539,8 @@
           and OrganGetTime &lt;= #{endtime}
     </select>
     <select id="getDistinctOrgansCount" resultType="com.ruoyi.project.domain.vo.DistinctOrgansCount">
-        select count(*) as gainsum,ifnull(sum( CASE WHEN transplantstate = 3 THEN 1 ELSE 0 END ),0) as abandonCount from service_donatecomporgan d
+        select count(*) as gainsum,ifnull(sum( CASE WHEN transplantstate = 3 THEN 1 ELSE 0 END ),0) as abandonCount from
+        service_donatecomporgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
         inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where d.OrganNo = #{organno}

--
Gitblit v1.9.3