From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml |   68 +++++++++++++++++++++++++++++++++
 1 files changed, 67 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index c2f6397..142adab 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -27,11 +27,32 @@
         <result property="assessState" column="assess_state"/>
         <result property="assessFirstTime" column="assess_first_time"/>
         <result property="assessSecondTime" column="assess_second_time"/>
-        <result property="del_flag" column="del_flag"/>
+        <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <resultMap type="com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO"
+               id="MedicalEvaluationWithBaseInfoVOResult">
+        <id property="id" column="ID"/>
+        <result property="infoid" column="infoID"/>
+        <result property="recordstate" column="recordstate"/>
+        <result property="caseNo" column="case_no"/>
+        <result property="donorno" column="DonorNo"/>
+        <result property="treatmenthospitalname" column="TreatmentHospitalName"/>
+        <result property="treatmenthospitalno" column="TreatmentHospitalNo"/>
+        <result property="sex" column="Sex"/>
+        <result property="age" column="Age"/>
+        <result property="bloodtype" column="BloodType"/>
+        <result property="idcardno" column="idcardno"/>
+        <result property="diagnosisname" column="diagnosisname"/>
+        <result property="coordinatorName" column="coordinator_name"/>
+        <result property="assessFirstTime" column="assess_first_time"/>
+        <result property="assessSecondTime" column="assess_second_time"/>
+        <result property="assessState" column="assess_state"/>
+        <result property="assessannex" column="AssessAnnex"/>
     </resultMap>
 
     <sql id="selectServiceMedicalevaluationVo">
@@ -172,4 +193,49 @@
           and CoreTeamAssessTime &lt;= #{endtime}
     </select>
 
+    <select id="selectEvaluateBaseInfoList" resultMap="MedicalEvaluationWithBaseInfoVOResult">
+        SELECT
+        sb.TreatmentHospitalName,
+        sb.TreatmentHospitalNo,
+        sb.DonorNo,
+        sb.case_no,
+        sb.Name,
+        sb.Sex,
+        sb.Age,
+        sb.BloodType,
+        sb.idcardno,
+        sb.diagnosisname,
+        sb.recordstate,
+        sb.coordinator_name,
+        sm.assess_first_time,
+        sm.infoID,
+        sm.ID,
+        sm.assessannex,
+        sm.assess_second_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
+        <where>
+
+            <if test="infoid != null">AND sm.InfoID = #{infoid}</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="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>
+            <if test="recordstate != null and recordstate != ''">AND sb.RecordState = #{recordstate}</if>
+            <if test="treatmenthospitalno != null and treatmenthospitalno != ''">AND sb.TreatmentHospitalNo =
+                #{treatmenthospitalno}
+            </if>
+            <if test="treatmenthospitalname != null and treatmenthospitalname != ''">AND sb.TreatmentHospitalName =
+                #{treatmenthospitalname}
+            </if>
+        </where>
+        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+
+    </select>
+
 </mapper>

--
Gitblit v1.9.3