From 2359f47c2f89a9867e72aa9b171cb118b874afec Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 三月 2026 10:29:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index 89cc4fc..6f5f0bd 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/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"/>
@@ -53,12 +56,15 @@
<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,
@@ -125,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`,
@@ -198,6 +205,7 @@
sb.DonorNo,
sb.case_no,
sb.Name,
+ sb.extracontent,
sb.Sex,
sb.Age,
sb.BloodType,
@@ -206,8 +214,9 @@
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
@@ -215,7 +224,8 @@
and sb.del_flag = 0 and sm.ID is not null
<where>
sb.termination_case = 0
- <if test="infoid != null">AND sm.InfoID = #{infoid}</if>
+ <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>
--
Gitblit v1.9.3