From b1da946455e295c376d5a17e8499c444d3fac428 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 12:06:03 +0800
Subject: [PATCH] update
---
sql/mysql/jh.sql | 49 ++++++++++++++++++++++++++-----------------------
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java | 6 +++---
2 files changed, 29 insertions(+), 26 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 8c8df04..904c37d 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
@@ -91,17 +91,17 @@
@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 );
}
diff --git a/sql/mysql/jh.sql b/sql/mysql/jh.sql
index 68fdcee..cf4c45f 100644
--- a/sql/mysql/jh.sql
+++ b/sql/mysql/jh.sql
@@ -43,29 +43,32 @@
-- ----------------------------
DROP TABLE IF EXISTS `queue`;
CREATE TABLE `queue` (
- `id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
- `pat_id` varchar(30) NOT NULL COMMENT '鎮ｈ�呯紪鍙�',
- `pat_name` varchar(10) NOT NULL COMMENT '鎮ｈ�呭鍚�',
- `pat_gender` tinyint DEFAULT NULL COMMENT '鎮ｈ�呮�у埆',
- `book_date` date NOT NULL COMMENT '棰勭害鏃ユ湡',
- `book_timeslot` int NOT NULL COMMENT '棰勭害鏃堕棿娈�',
- `book_check_type` tinyint DEFAULT NULL COMMENT '棰勭害妫�鏌ョ被鍨�',
- `seq_num` int DEFAULT NULL COMMENT '鎺掗槦搴忓彿',
- `status` tinyint NOT NULL COMMENT '10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡',
- `passed` tinyint DEFAULT 0 COMMENT '杩囧彿鏍囪',
- `expired` tinyint DEFAULT 0 COMMENT '棰勭害杩囨湡鏍囪',
- `jump_flag` tinyint DEFAULT 0 COMMENT '鎻掗槦鏍囪',
- `room_id` BIGINT DEFAULT 0 COMMENT '璇婂缂栧彿',
- `room_name` varchar(10) DEFAULT "" COMMENT '璇婂鍚嶇О',
- `bed_no` varchar(10) DEFAULT "" COMMENT '璇婄枟搴婄紪鍙�',
- `tenant_id` int DEFAULT 1 COMMENT '绉熸埛缂栧彿',
- `creator` varchar(10) DEFAULT '' COMMENT '鍒涘缓鑰�',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `updater` varchar(10) DEFAULT '' COMMENT '鏇存柊鑰�',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- `deleted` bit DEFAULT 0 COMMENT '鍒犻櫎鏍囪',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鎺掗槦琛�';
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `pat_id` varchar(30) NOT NULL COMMENT '鎮ｈ�呯紪鍙�',
+ `pat_name` varchar(10) NOT NULL COMMENT '鎮ｈ�呭鍚�',
+ `pat_gender` tinyint DEFAULT NULL COMMENT '鎮ｈ�呮�у埆',
+ `book_date` date NOT NULL COMMENT '棰勭害鏃ユ湡',
+ `book_timeslot` int NOT NULL COMMENT '棰勭害鏃堕棿娈�',
+ `book_check_type` tinyint DEFAULT NULL COMMENT '棰勭害妫�鏌ョ被鍨�',
+ `seq_num` int DEFAULT NULL COMMENT '鎺掗槦搴忓彿',
+ `status` tinyint NOT NULL COMMENT '10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡',
+ `passed` tinyint DEFAULT '0' COMMENT '杩囧彿鏍囪',
+ `expired` tinyint DEFAULT '0' COMMENT '棰勭害杩囨湡鏍囪',
+ `jump_flag` tinyint DEFAULT '0' COMMENT '鎻掗槦鏍囪',
+ `room_id` bigint DEFAULT '0' COMMENT '璇婂缂栧彿',
+ `room_name` varchar(10) DEFAULT '' COMMENT '璇婂鍚嶇О',
+ `bed_no` varchar(10) DEFAULT '' COMMENT '璇婄枟搴婄紪鍙�',
+ `tenant_id` int DEFAULT '1' COMMENT '绉熸埛缂栧彿',
+ `creator` varchar(10) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(10) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) DEFAULT b'0' COMMENT '鍒犻櫎鏍囪',
+ PRIMARY KEY (`id`),
+ KEY `idx_status` (`status`) USING BTREE,
+ KEY `idx_seq_num` (`seq_num`) USING BTREE,
+ KEY `idx_room_bed_status` (`room_id`,`bed_no`,`status`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鎺掗槦琛�';
-- ----------------------------
--
Gitblit v1.9.3