From 2944ea778f0fc87c8e09ae47200d9de8069049e3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 十二月 2025 10:46:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 141 +++++++++++++++++++++++++++++++---------------
1 files changed, 94 insertions(+), 47 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index 39f3514..c2f6397 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -1,50 +1,81 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceMedicalevaluationMapper">
<resultMap type="com.ruoyi.project.domain.ServiceMedicalevaluation" id="ServiceMedicalevaluationResult">
- <result property="id" column="ID" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="illnessoverview" column="IllnessOverview" />
- <result property="diagnosisname" column="DiagnosisName" />
- <result property="hospitalassesscontent" column="HospitalAssessContent" />
- <result property="hospitalassessdoctor" column="HospitalAssessDoctor" />
- <result property="hospitalassesstime" column="HospitalAssessTime" />
- <result property="hospitalassessconclusion" column="HospitalAssessConclusion" />
- <result property="provincialassesscontent" column="ProvincialAssessContent" />
- <result property="provincialassessdoctor" column="ProvincialAssessDoctor" />
- <result property="provincialassesstime" column="ProvincialAssessTime" />
- <result property="provincialassessconclusion" column="ProvincialAssessConclusion" />
- <result property="coreteamassesscontent" column="CoreTeamAssessContent" />
- <result property="coreteamassessdoctor" column="CoreTeamAssessDoctor" />
- <result property="coreteamassesstime" column="CoreTeamAssessTime" />
- <result property="coreteamassessconclusion" column="CoreTeamAssessConclusion" />
- <result property="assessannex" column="AssessAnnex" />
- <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" />
- <result property="updateTime" column="update_time" />
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="caseNo" column="case_no"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="illnessoverview" column="IllnessOverview"/>
+ <result property="diagnosisname" column="DiagnosisName"/>
+ <result property="hospitalassesscontent" column="HospitalAssessContent"/>
+ <result property="hospitalassessdoctor" column="HospitalAssessDoctor"/>
+ <result property="hospitalassesstime" column="HospitalAssessTime"/>
+ <result property="hospitalassessconclusion" column="HospitalAssessConclusion"/>
+ <result property="provincialassesscontent" column="ProvincialAssessContent"/>
+ <result property="provincialassessdoctor" column="ProvincialAssessDoctor"/>
+ <result property="provincialassesstime" column="ProvincialAssessTime"/>
+ <result property="provincialassessconclusion" column="ProvincialAssessConclusion"/>
+ <result property="coreteamassesscontent" column="CoreTeamAssessContent"/>
+ <result property="coreteamassessdoctor" column="CoreTeamAssessDoctor"/>
+ <result property="coreteamassesstime" column="CoreTeamAssessTime"/>
+ <result property="coreteamassessconclusion" column="CoreTeamAssessConclusion"/>
+ <result property="assessannex" column="AssessAnnex"/>
+ <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="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
</resultMap>
<sql id="selectServiceMedicalevaluationVo">
- 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
+ select ID,
+ InfoID,
+ case_no,
+ assess_second_time,
+ assess_first_time,
+ DonorNo,
+ assess_state,
+ 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="com.ruoyi.project.domain.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>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
</where>
</select>
-
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.MedicalEvaluationVO">
- SELECT
+ SELECT
`service_donatebaseinfo`.`ID` AS `ID`,
`service_donatebaseinfo`.`Name` AS `Name`,
`service_donatebaseinfo`.`Sex` AS `Sex`,
@@ -73,6 +104,7 @@
`service_donatebaseinfo`.`termination_case` AS `terminationCase`,
`service_donatebaseinfo`.`donatetime` AS `donatetime`,
`service_medicalevaluation`.`ID` AS `meID`,
+ `service_medicalevaluation`.`case_no` AS `case_no`,
`service_medicalevaluation`.`HospitalAssessContent` AS `HospitalAssessContent`,
`service_medicalevaluation`.`HospitalAssessConclusion` AS `HospitalAssessConclusion`,
`service_medicalevaluation`.`ProvincialAssessContent` AS `ProvincialAssessContent`,
@@ -93,36 +125,51 @@
`service_medicalevaluation`.`create_time` AS `createtime`,
`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`
- LEFT JOIN `service_medicalevaluation` ON
- `service_donatebaseinfo`.`ID` = `service_medicalevaluation`.`InfoID`
+ `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>
- <if test="treatmenthospitalno != null and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
- <if test="recordstate != null and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
- <if test="basecreateby != null and basecreateby != ''"> and `service_donatebaseinfo`.`create_by` = #{basecreateby}</if>
- <if test="starttime != null "> and `service_medicalevaluation`.CoreTeamAssessTime >= #{starttime} </if>
- <if test="endtime != null "> and `service_medicalevaluation`.CoreTeamAssessTime <= #{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>
- <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
- </where>
+ <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="caseNo != null and caseNo != ''">and `service_donatebaseinfo`.`case_no` = #{caseNo}</if>
+ <if test="idcardno != null and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and
+ `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
+ </if>
+ <if test="recordstate != null and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
+ #{recordstate}
+ </if>
+ <if test="basecreateby != null and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
+ #{basecreateby}
+ </if>
+ <if test="starttime != null ">and `service_medicalevaluation`.CoreTeamAssessTime >= #{starttime}</if>
+ <if test="endtime != null ">and `service_medicalevaluation`.CoreTeamAssessTime <= #{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>
+ <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
+ </where>
order by `service_medicalevaluation`.`create_time` desc,
`service_donatebaseinfo`.`create_time` desc
</select>
<select id="countNumber" resultType="java.lang.Integer">
- select count(*) from service_medicalevaluation
- where CoreTeamAssessTime >= #{starttime} and CoreTeamAssessTime <= #{endtime}
+ select count(*)
+ from service_medicalevaluation
+ where CoreTeamAssessTime >= #{starttime}
+ and CoreTeamAssessTime <= #{endtime}
</select>
</mapper>
--
Gitblit v1.9.3