代码提交

liusheng

2026-03-13 2359f47c2f89a9867e72aa9b171cb118b874afec

 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"/>
@@ -45,6 +47,7 @@
        <result property="treatmenthospitalno" column="TreatmentHospitalNo"/>
        <result property="sex" column="Sex"/>
        <result property="age" column="Age"/>
        <result property="name" column="Name"/>
        <result property="bloodtype" column="BloodType"/>
        <result property="idcardno" column="idcardno"/>
        <result property="diagnosisname" column="diagnosisname"/>
@@ -52,12 +55,16 @@
        <result property="assessTime" column="assess_time"/>
        <result property="assessState" column="assess_state"/>
        <result property="assessannex" column="AssessAnnex"/>
        <result property="donationcategory" column="donationcategory"/>
        <result property="extracontent" column="extracontent"/>
        <result property="inpatientno" column="InpatientNo"/>
    </resultMap>

    <sql id="selectServiceMedicalevaluationVo">
        select ID,
               InfoID,
               case_no,
               organdecision_other,
               DonorNo,
               assess_state,
               assess_time,
@@ -124,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`,
@@ -193,9 +201,11 @@
        SELECT
        sb.TreatmentHospitalName,
        sb.TreatmentHospitalNo,
        sb.DonationCategory as donationcategory,
        sb.DonorNo,
        sb.case_no,
        sb.Name,
        sb.extracontent,
        sb.Sex,
        sb.Age,
        sb.BloodType,
@@ -204,14 +214,18 @@
        sb.recordstate,
        sb.coordinator_name,
        sb.id as infoID,
        sm.ID,
        sm.ID as id,
        sm.assessannex,
        sm.organdecision_other,
        sm.assess_time,
        sm.assess_state
        FROM service_donatebaseinfo sb
        LEFT JOIN service_medicalevaluation sm ON sb.ID = sm.InfoID and sm.del_flag = 0
        and sb.del_flag = 0
        and sb.del_flag = 0 and sm.ID is not null
        <where>
            <if test="infoid != null">AND sm.InfoID = #{infoid}</if>
            sb.termination_case = 0
            <if test="infoid != null">AND sb.ID = #{infoid}</if>
            <if test="inpatientno != null">AND sb.InpatientNo = #{inpatientno}</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>