ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -32,12 +32,14 @@
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="organdecisionOther" column="organdecision_other"/>
    </resultMap>
    <resultMap type="com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO"
               id="MedicalEvaluationWithBaseInfoVOResult">
        <id property="id" column="ID"/>
        <result property="infoid" column="infoID"/>
        <result property="organdecisionOther" column="organdecision_other"/>
        <result property="recordstate" column="recordstate"/>
        <result property="caseNo" column="case_no"/>
        <result property="donorno" column="DonorNo"/>
@@ -62,6 +64,7 @@
        select ID,
               InfoID,
               case_no,
               organdecision_other,
               DonorNo,
               assess_state,
               assess_time,
@@ -128,6 +131,7 @@
        `service_donatebaseinfo`.`donatetime` AS `donatetime`,
        `service_medicalevaluation`.`ID` AS `meID`,
        `service_medicalevaluation`.`case_no` AS `case_no`,
        `service_medicalevaluation`.`organdecision_other` AS `organdecision_other`,
        `service_medicalevaluation`.`HospitalAssessContent` AS `HospitalAssessContent`,
        `service_medicalevaluation`.`HospitalAssessConclusion` AS `HospitalAssessConclusion`,
        `service_medicalevaluation`.`ProvincialAssessContent` AS `ProvincialAssessContent`,
@@ -212,6 +216,7 @@
        sb.id as infoID,
        sm.ID as id,
        sm.assessannex,
        sm.organdecision_other,
        sm.assess_time,
        sm.assess_state
        FROM service_donatebaseinfo sb
@@ -221,11 +226,13 @@
            sb.termination_case = 0
            <if test="infoid != null">AND sb.ID = #{infoid}</if>
            <if test="inpatientno != null">AND sb.InpatientNo = #{inpatientno}</if>
            <if test="urrentMedicalInstitution != null">AND sb.current_medical_institution = #{urrentMedicalInstitution}</if>
            <if test="caseNo != null and caseNo != ''">AND sm.case_no = #{caseNo}</if>
            <if test="donorno != null and donorno != ''">AND sm.DonorNo = #{donorno}</if>
            <if test="diagnosisname != null and diagnosisname != ''">AND sm.DiagnosisName = #{diagnosisname}</if>
            <if test="assessState != null and assessState != ''">AND sm.assess_state = #{assessState}</if>
            <if test="assessTime != null ">AND sm.assess_time = #{assessTime}</if>
            <if test="startAssessTime != null and endAssessTime != null ">and assess_time BETWEEN  #{startAssessTime} and  #{endAssessTime}</if>
            <if test="name != null and name != ''">AND sb.Name LIKE CONCAT('%', #{name}, '%')</if>
            <if test="sex != null and sex != ''">AND sb.Sex = #{sex}</if>
            <if test="idcardno != null and idcardno != ''">AND sb.IDCardNo = #{idcardno}</if>
@@ -237,6 +244,8 @@
                #{treatmenthospitalname}
            </if>
        </where>
        order by sd.InpatientNo desc
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>