From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index 142adab..13b1255 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -45,24 +45,26 @@
<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"/>
<result property="coordinatorName" column="coordinator_name"/>
- <result property="assessFirstTime" column="assess_first_time"/>
- <result property="assessSecondTime" column="assess_second_time"/>
+ <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,
- assess_second_time,
- assess_first_time,
DonorNo,
assess_state,
+ assess_time,
IllnessOverview,
DiagnosisName,
HospitalAssessContent,
@@ -147,8 +149,6 @@
`service_medicalevaluation`.`create_by` AS `createby`,
`service_medicalevaluation`.`update_by` AS `updateby`,
`service_medicalevaluation`.`assess_state` AS `assess_state`,
- `service_medicalevaluation`.`assess_second_time` AS `assess_second_time`,
- `service_medicalevaluation`.`assess_first_time` AS `assess_first_time`,
`service_medicalevaluation`.`update_time` AS `updatetime`
FROM
`service_donatebaseinfo`
@@ -197,9 +197,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,
@@ -207,22 +209,23 @@
sb.diagnosisname,
sb.recordstate,
sb.coordinator_name,
- sm.assess_first_time,
- sm.infoID,
- sm.ID,
+ sb.id as infoID,
+ sm.ID as id,
sm.assessannex,
- sm.assess_second_time,
+ 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>
<if test="assessState != null and assessState != ''">AND sm.assess_state = #{assessState}</if>
+ <if test="assessTime != null ">AND sm.assess_time = #{assessTime}</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>
--
Gitblit v1.9.3