sinake
2026-10-28 34599c2b887dd98d822cb993125920817505cd6d
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -52,6 +52,8 @@
        <result property="occupation" column="occupation"/>
        <result property="assessannex" column="assessannex"/>
        <result property="relativeRemark" column="relative_remark"/>
        <result property="relativeconfirmationsignname" column="relativeconfirmationsignname"/>
        <result property="relativeidcardno" column="relativeidcardno"/>
    </resultMap>
    <sql id="selectServiceRelativesconfirmationVo">
@@ -274,6 +276,7 @@
        sd.InpatientNo as inpatientno,
        sd.extracontent as extracontent,
        sd.RecordState as recordstate,
        sd.DonationCategory as donationcategory,
        sd.Sex as sex,
        sd.Age as age,
        sd.BloodType as bloodtype,
@@ -297,17 +300,22 @@
        sr.ResponsibleUserID as responsibleuserid,
        sr.CoordinatedUserIDO as coordinateduserido,
        sr.CoordinatedUserNameO as coordinatedusernameo,
        sr.CoordinatedUserNameT as coordinateduseridt,
        sr.CoordinatedUserNameT as coordinatedusernamet,
        sr.ResponsibleUserID as responsibleuserid,
        sr.nation as nation,
        sr.occupation as occupation,
        sr.relative_remark as relativeRemark,
        sr.assessannex as assessannex,
        sr.education as education
        sr.education as education,
        sr.relativeconfirmationsignname,
        sr.relativeidcardno,
        sr.state,
        sr.other_family_members
        FROM service_donatebaseinfo sd
        LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
        AND sr.del_flag = 0
        <where>
            sd.termination_case = 0
            <if test="infoid != null">AND sd.ID = #{infoid}</if>
            <if test="recordstate != null and recordstate != ''">AND sd.RecordState = #{recordstate}</if>
            <if test="caseNo != null and caseNo != ''">AND sd.case_no = #{caseNo}</if>
@@ -333,7 +341,9 @@
                and sr.SignDate &lt;= #{endSigndate}
            </if>
        </where>
        order by sd.ReportTime desc
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>
</mapper>