From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java
index 0536dff..bc3d90b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java
@@ -12,7 +12,6 @@
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
/**
* 宸ヤ綔璁板綍 Mapper
@@ -24,7 +23,8 @@
default PageResult<JobRecordDO> selectPage(JobRecordPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<JobRecordDO>()
- .eqIfPresent(JobRecordDO::getJobType, reqVO.getJobType())
+ //.eqIfPresent(JobRecordDO::getJobType, reqVO.getJobType())
+ .inIfPresent(JobRecordDO::getJobType, reqVO.getJobType())
.eqIfPresent(JobRecordDO::getDocId, reqVO.getDocId())
.likeIfPresent(JobRecordDO::getDocName, reqVO.getDocName())
.eqIfPresent(JobRecordDO::getDevId, reqVO.getDevId())
@@ -38,8 +38,15 @@
.orderByDesc(JobRecordDO::getId));
}
- @Select("SELECT * FROM lihu.job_record where rent_id=#{rentId} and job_type=#{jobType} and doc_id=#{docId} limit 1")
- JobRecordDO selectByRentIdJobTypeDocId(@Param("rentId") Long rentId, @Param("jobType") Integer jobType, @Param("docId") Long docId );
+ @Select("<script> " +
+ "SELECT * FROM lihu.job_record " +
+ " where rent_id=#{rentId} and doc_id=#{docId} and job_type in (" +
+ " <foreach collection='jobTypeList' separator=',' item='jobType'>" +
+ " #{jobType} " +
+ " </foreach> )" +
+ " limit 1;" +
+ " </script>")
+ JobRecordDO selectByRentIdDocId(@Param("rentId") Long rentId, @Param("docId") Long docId, @Param("jobTypeList") List<Integer> jobTypeList );
@Select("SELECT count(1) FROM lihu.job_record where pat_id=#{patId} and TO_DAYS(job_time)=TO_DAYS(#{jobTime}) and job_type=#{jobType} ")
Integer getPatientJobNum(@Param("patId") String patId, @Param("jobTime") LocalDateTime jobTime, @Param("jobType") Integer jobType );
--
Gitblit v1.9.3