From 0e0d74df77bdbc0d7ac886d187b3cfbf9b30718d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 27 八月 2024 14:33:23 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java | 26 +++++++-------------------
1 files changed, 7 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 8467e63..d683476 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
@@ -6,11 +6,8 @@
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
import java.util.List;
@@ -66,22 +63,10 @@
"</script>")
List<BedQueueStatisticDO> bedQueueStatistic(@Param("roomId")Long roomId, @Param("bedNo")String bedNo);
- @Select("<script>" +
- "SELECT * FROM lihu.queue where status in (" +
- " <foreach collection='statusList' separator=',' item='status'>" +
- " #{status} " +
- " </foreach> )" +
- " order by book_timeslot, create_time " +
- "</script>")
- List<QueueDO> getOrderedQueue(@Param("statusList")List<Byte> statusList);
-
@Update("update lihu.queue set status = #{newStatus} where seq_num = \n" +
"(select a.min_seq_num from \n" +
" (select min(seq_num) as min_seq_num from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus}) a )")
Integer updateQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
-
- @Select("select * from lihu.queue where status = #{status} order by book_timeslot, create_time limit 1")
- QueueDO getFirstInQueueByStatus(Byte status);
@Select("<script>" +
"SELECT * FROM lihu.queue " +
@@ -103,17 +88,20 @@
@Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum}, passed = 1 " +
" where id = " +
" (select a.id from \n" +
- " (select id from lihu.queue where status = #{curStatus} and room_id = #{roomId} and room_name = #{roomName} and bed_no = #{bedNo} order by seq_num limit 1) a)")
+ " (select id from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} order by seq_num limit 1) a)")
Integer procPassedReturnPatient(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
@Param("seqNum")Integer seqNum, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
@Update("update lihu.queue set status = #{newStatus} " +
- " where pat_id = #{patId} and status = #{curStatus} and room_id = #{roomId} and bed_no = #{bedNo}")
+ " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} and pat_id = #{patId} ")
Integer passedPatientReturn(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("patId")String patId,
@Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
@Update("update lihu.queue set jump_flag = #{jumped} " +
- " where pat_id = #{patId} and status = #{curStatus}")
+ " where status = #{curStatus} and pat_id = #{patId}")
Integer queueJump(@Param("patId")String patId, @Param("curStatus")Byte curStatus, @Param("jumped")Byte jumped );
+
+ @Delete("delete from lihu.queue where TO_DAYS(book_date) != TO_DAYS(NOW())")
+ Integer clearQueue();
}
--
Gitblit v1.9.3