From d1708b4b2bc6596f9c62354274f1af97be45401c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 28 十一月 2024 14:40:46 +0800
Subject: [PATCH] 按工位的多个检查项目 抢占 排队中 患者
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 19 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 ba35dd8..b29be78 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 " +
@@ -155,13 +172,43 @@
"where room_id = #{roomId} and bed_no = #{bedNo} and status in (" +
" <foreach collection='statusList' separator=',' item='status'>" +
" #{status} " +
- " </foreach> )" +
- " order by status desc, seq_num" +
+ " </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 limit 1")
+ @Select("SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} order by seq_num, create_time limit 1")
QueueDO getFirstItemByBedAndStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
+
+ // 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
+ // 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
+ @Select("<script> " +
+ "select * from lihu.queue where room_id = #{roomId} and status in ( " +
+ " <foreach collection='curStatusList' separator=',' item='status'>" +
+ " #{status} " +
+ " </foreach> )" +
+ " order by seq_num, create_time limit 1 " +
+ "</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} " +
+ " and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+ QueueDO XXX(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+ @Param("patId")String patId, @Param("checkType")Integer checkType,
+ @Param("curStatus")Integer curStatus);
+*/
@Update("update lihu.queue set status = #{newStatus} where status = #{curStatus} and seq_num = \n" +
"(select a.min_seq_num from \n" +
@@ -197,6 +244,22 @@
@Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
@Param("checkType")Integer checkType);
+ // 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰 鏍规嵁 澶氫釜妫�鏌ラ」鐩�
+ @Update("<script>" +
+ "update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
+ " bed_no = #{bedNo}, seq_num = #{seqNum} where id = \n" +
+ " (select a.id from \n" +
+ " (select id from lihu.queue where status = #{curStatus} " +
+ " and book_check_type in ( " +
+ " <foreach collection='checkTypeArray' separator=',' item='_checkType'>" +
+ " #{_checkType} " +
+ " </foreach> )" +
+ " order by jump_flag desc, book_timeslot, create_time limit 1) a) " +
+ "</script>")
+ Integer preemptWaitingPatientWithBedCheckTypes(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
+ @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
+ @Param("checkTypeArray")Integer[] checkTypeArray);
+
@Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum} " +
" where id = " +
" (select a.id from \n" +
@@ -209,14 +272,16 @@
// 甯歌妫�鏌� 鎴� 棰嗙敤 鐨勬偅鑰呭彫鍥�, 鍘熷伐浣嶅鐞�
@Update("update lihu.queue set status = #{newStatus}, passed = 1 " +
- " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} and pat_id = #{patId} ")
- Integer recallPassedPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("patId")String patId,
+ " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+ Integer recallPassedPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+ @Param("patId")String patId, @Param("checkType")Integer checkType,
@Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
// 瑁呮満鍖荤敓 鍏佽鎶㈠崰 鏈瀹� [瀹夎杩囧彿] 鐨勬偅鑰�
@Update("update lihu.queue set status = #{newStatus}, bed_no = #{bedNo}, passed = 1 " +
- " where room_id = #{roomId} and status = #{curStatus} and pat_id = #{patId} ")
- Integer recallPassedInstallPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("patId")String patId,
+ " where room_id = #{roomId} and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+ Integer recallPassedInstallPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+ @Param("patId")String patId, @Param("checkType")Integer checkType,
@Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
@Update("update lihu.queue set jump_flag = #{jumped} " +
--
Gitblit v1.9.3