修改了统计

yxh

2 天以前 a1f2eefe4641764955c846ad58ebdbcedd96699d

 ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml

@@ -13,8 +13,8 @@
        <result property="abandonreason" column="AbandonReason"/>
        <result property="transplanttime" column="TransplantTime"/>
        <result property="transplantdoct" column="TransplantDoct"/>
        <result property="transplanthospitalno" column="TransplantHospitalNo"/>
        <result property="transplanthospitalname" column="TransplantHospitalName"/>
        <result property="hospitalno" column="HospitalNo"/>
        <result property="hospitalname" column="HospitalName"/>
        <result property="name" column="Name"/>
        <result property="sex" column="Sex"/>
        <result property="idcardtype" column="IDCardType"/>
@@ -34,11 +34,15 @@
        <result property="residencecommunityname" column="ResidenceCommunityName"/>
        <result property="residencecountycode" column="ResidenceCountyCode"/>
        <result property="residencecountyname" column="ResidenceCountyName"/>
        <!-- 2026-10-23：器官排队序号 -->
        <result property="sort" column="sort"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="caseno" column="caseno"/>
        <result property="donorname" column="donorname"/>
    </resultMap>

    <sql id="selectServiceDonatecomporganVo">
@@ -46,13 +50,15 @@
               InfoID,
               OrganNo,
               OrganName,
               sort,
               transplantstate,
               AbandonReason,
               TransplantTime,
               TransplantDoct,
               TransplantHospitalNo,
               TransplantHospitalName,
               HospitalNo,
               HospitalName,
               Name,
               caseno,
               Sex,
               IDCardType,
               IDCardNo,
@@ -75,7 +81,8 @@
               create_by,
               create_time,
               update_by,
               update_time
               update_time,
               donorname
        from service_donatecomporgan
    </sql>

@@ -90,14 +97,15 @@
            <if test="abandonreason != null  and abandonreason != ''">and AbandonReason = #{abandonreason}</if>
            <if test="transplanttime != null ">and TransplantTime = #{transplanttime}</if>
            <if test="transplantdoct != null  and transplantdoct != ''">and TransplantDoct = #{transplantdoct}</if>
            <if test="transplanthospitalno != null  and transplanthospitalno != ''">and TransplantHospitalNo =
                #{transplanthospitalno}
            <if test="hospitalno != null  and hospitalno != ''">and HospitalNo =
                #{hospitalno}
            </if>
            <if test="transplanthospitalname != null  and transplanthospitalname != ''">and TransplantHospitalName like
                concat('%', #{transplanthospitalname}, '%')
            <if test="hospitalname != null  and hospitalname != ''">and HospitalName like
                concat('%', #{hospitalname}, '%')
            </if>
            <if test="name != null  and name != ''">and Name like concat('%', #{name}, '%')</if>
            <if test="sex != null ">and Sex = #{sex}</if>
            <if test="caseno != null ">and caseno = #{caseno}</if>
            <if test="idcardtype != null ">and IDCardType = #{idcardtype}</if>
            <if test="idcardno != null  and idcardno != ''">and IDCardNo = #{idcardno}</if>
            <if test="age != null ">and Age = #{age}</if>
@@ -105,6 +113,8 @@
            <if test="birthday != null  and birthday != ''">and Birthday = #{birthday}</if>
            <if test="phone != null  and phone != ''">and Phone = #{phone}</if>
            <if test="residenceaddress != null  and residenceaddress != ''">and ResidenceAddress = #{residenceaddress}
            </if>
            <if test="donorname != null  and donorname != ''">and donorname = #{donorname}
            </if>
            <if test="residenceprovince != null  and residenceprovince != ''">and ResidenceProvince =
                #{residenceprovince}
@@ -133,6 +143,8 @@
                concat('%', #{residencecountyname}, '%')
            </if>
        </where>
        <!-- 2026-10-23：按器官排队序号排序（空的排最后，再按主键兜底） -->
        order by (sort is null or sort = 0), sort asc, ID asc
    </select>

</mapper>