sinake
7 天以前 4a54dc2ce371d90d19b264238c32efc7b871c772
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">
@@ -289,21 +291,25 @@
        sr.Kinship_ChildrenNum as kinshipChildrenNum,
        sr.KinshipConfirmationSign as kinshipConfirmationSign,
        sr.RelativeConfirmationSign as relativeConfirmationSign,
        sr.OrganDecision as organDecision,
        sr.OrganDecision_Other as organDecisionOther,
        sr.SignFamilyRelations as signFamilyRelations,
        sr.OrganDecision as organdecision,
        sr.OrganDecision_Other as organdecisionOther,
        sr.SignFamilyRelations as signfamilyrelations,
        sr.SignDate as signdate,
        sr.ResponsibleUserName as responsibleusername,
        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
@@ -315,7 +321,7 @@
                #{treatmenthospitalname}
            </if>
            <if test="name != null and name != ''">AND sd.Name = #{name}</if>
            <if test="inpatientno != null ">AND sd.InpatientNo = #{inpatientno}</if>
            <if test="inpatientno != null and inpatientno != ''">AND sd.InpatientNo = #{inpatientno}</if>
            <if test="responsibleusername != null and responsibleusername != ''">AND sd.ResponsibleUserName =
                #{responsibleusername}
            </if>
@@ -333,7 +339,9 @@
                and sr.SignDate &lt;= #{endSigndate}
            </if>
        </where>
        order by sd.InpatientNo desc
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>
</mapper>