变更

liusheng

2024-08-02 b9cc263b8d1d31608a4c16cd157cc84b51e3d29d

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

@@ -23,7 +23,7 @@
        <result property="coreteamassesstime"    column="CoreTeamAssessTime"    />
        <result property="coreteamassessconclusion"    column="CoreTeamAssessConclusion"    />
        <result property="assessannex"    column="AssessAnnex"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@@ -34,7 +34,7 @@
        select ID, InfoID, DonorNo, IllnessOverview, DiagnosisName, HospitalAssessContent, HospitalAssessDoctor, HospitalAssessTime, HospitalAssessConclusion, ProvincialAssessContent, ProvincialAssessDoctor, ProvincialAssessTime, ProvincialAssessConclusion, CoreTeamAssessContent, CoreTeamAssessDoctor, CoreTeamAssessTime, CoreTeamAssessConclusion, AssessAnnex, del_flag, create_by, create_time, update_by, update_time from service_medicalevaluation
    </sql>

    <select id="selectServiceMedicalevaluationList" parameterType="ServiceMedicalevaluation" resultMap="ServiceMedicalevaluationResult">
    <select id="selectServiceMedicalevaluationList" parameterType="com.ruoyi.project.domain.ServiceMedicalevaluation" resultMap="ServiceMedicalevaluationResult">
        <include refid="selectServiceMedicalevaluationVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
@@ -69,6 +69,9 @@
        `service_donatebaseinfo`.`ReporterNo` AS `ReporterNo`,
        `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
        `service_donatebaseinfo`.`create_by` AS `basecreateby`,
        `service_donatebaseinfo`.`workflow` AS `workflow`,
        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
        `service_donatebaseinfo`.`donatetime` AS `donatetime`,
        `service_medicalevaluation`.`ID` AS `meID`,
        `service_medicalevaluation`.`HospitalAssessContent` AS `HospitalAssessContent`,
        `service_medicalevaluation`.`HospitalAssessConclusion` AS `HospitalAssessConclusion`,
@@ -92,15 +95,14 @@
        `service_medicalevaluation`.`update_by` AS `updateby`,
        `service_medicalevaluation`.`update_time` AS `updatetime`
        FROM

            `service_donatebaseinfo`
            LEFT JOIN `service_medicalevaluation` ON
            `service_donatebaseinfo`.`ID` = `service_medicalevaluation`.`InfoID`
        LEFT JOIN `base_organization` ON
        `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`


        <where>
            service_medicalevaluation.del_flag = 0
            and service_donatebaseinfo.del_flag = 0
            <if test="name != null  and name != ''"> and `service_donatebaseinfo`.Name like concat('%', #{name}, '%')</if>
            <if test="donorno != null  and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
            <if test="idcardno != null  and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
@@ -111,7 +113,7 @@
            <if test="endtime != null ">  and `service_medicalevaluation`.CoreTeamAssessTime &lt;= #{endtime}</if>
            <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
            <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
            service_medicalevaluation.del_flag != 1
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
    </where>

        order by `service_medicalevaluation`.`create_time` desc,
@@ -123,4 +125,4 @@
        where CoreTeamAssessTime >= #{starttime} and CoreTeamAssessTime &lt;= #{endtime}
    </select>

</mapper>
</mapper>