From ec319725143e7ba7bca98ffb99470eeab5f9d997 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 26 十一月 2024 22:46:08 +0800
Subject: [PATCH] 排队界面 可以多状态搜索
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
index 7592e6b..a344533 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
@@ -27,7 +27,7 @@
.eqIfPresent(QueueDO::getBookTimeslot, reqVO.getBookTimeslot())
.eqIfPresent(QueueDO::getBookCheckType, reqVO.getBookCheckType())
.eqIfPresent(QueueDO::getSeqNum, reqVO.getSeqNum())
- .eqIfPresent(QueueDO::getStatus, reqVO.getStatus())
+ .inIfPresent(QueueDO::getStatus, reqVO.getStatus())
.eqIfPresent(QueueDO::getPassed, reqVO.getPassed())
.eqIfPresent(QueueDO::getExpired, reqVO.getExpired())
.eqIfPresent(QueueDO::getRoomId, reqVO.getRoomId())
@@ -67,24 +67,41 @@
@Select("<script>" +
"SELECT * FROM lihu.queue " +
- "where pat_id = #{patId} and book_check_type in (" +
- " <foreach collection='arrCheckType' separator=',' item='checkType'>" +
- " #{checkType} " +
- " </foreach> )" +
- " and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+ "where pat_id = #{patId} " +
+ " and book_check_type in (" +
+ " <foreach collection='arrCheckType' separator=',' item='checkType'>" +
+ " #{checkType} " +
+ " </foreach> )" +
+ " and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
"</script>")
List<QueueDO> getCurPatGivenCheckTypes(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType);
@Select("<script>" +
"SELECT * FROM lihu.queue " +
- "where pat_id = #{patId} and book_check_type in (" +
- " <foreach collection='arrCheckType' separator=',' item='checkType'>" +
- " #{checkType} " +
- " </foreach> ) " +
- " and status = #{status} " +
- " and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+ "where pat_id = #{patId} " +
+ " and book_check_type in (" +
+ " <foreach collection='arrCheckType' separator=',' item='_checkType'>" +
+ " #{_checkType} " +
+ " </foreach> ) " +
+ " and status = #{status} " +
+ " and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
"</script>")
List<QueueDO> getCurPatGivenCheckTypesAndStatus(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("status")Integer status);
+
+ @Select("<script>" +
+ "SELECT * FROM lihu.queue " +
+ "where pat_id = #{patId} " +
+ " and book_check_type in (" +
+ " <foreach collection='arrCheckType' separator=',' item='_checkType'>" +
+ " #{_checkType} " +
+ " </foreach> ) " +
+ " and status in (" +
+ " <foreach collection='statusList' separator=',' item='_status'>" +
+ " #{_status} " +
+ " </foreach> ) " +
+ " and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+ "</script>")
+ List<QueueDO> getCurPatGivenCheckTypesAndStatusList(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("statusList")List<Integer> statusList);
@Select("<script>" +
"SELECT * FROM lihu.queue " +
@@ -158,6 +175,9 @@
" </foreach> ) " +
" order by status desc, seq_num " +
"</script>")
+ @Results({
+ @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
List<QueueDO> getBedQueueByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);
@Select("SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} order by seq_num, create_time limit 1")
@@ -174,6 +194,13 @@
"</script>" )
QueueDO getFirstItemByRoomAndStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
+ @Select("<script> " +
+ "select * from lihu.queue where appoint_id in ( " +
+ " <foreach collection='appointIdList' separator=',' item='appointId'>" +
+ " #{appointId} " +
+ " </foreach> )" +
+ "</script>" )
+ List<QueueDO> selectBookSeqNumByAppointIdList(@Param("appointIdList") List<Long> appointIdList);
/*
@Select("select * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} " +
--
Gitblit v1.9.3