From 7485643ee7de86e6edd3da5ad3291be83991b7a7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 13:59:49 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 25 +++++++-----
sql/mysql/jh.sql | 54 +++++++++++++-------------
2 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index ead467e..a563539 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -11,6 +11,7 @@
import cn.lihu.jh.module.ecg.service.queue.QueueService;
import cn.lihu.jh.module.ecg.service.room.RoomService;
import cn.lihu.jh.module.system.api.dept.DeptApi;
+import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -189,16 +190,20 @@
return error( new ErrorCode(101, "涓嶆槸浠婂ぉ鐨勯绾︾敤鎴�"));
*/
- QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
- queueSaveReqVO.setPatId( appointment.getPatId());
- queueSaveReqVO.setPatName( appointment.getPatName() );
- queueSaveReqVO.setPatGender( appointment.getPatGender());
- queueSaveReqVO.setBookDate( appointment.getBookDate() );
- queueSaveReqVO.setBookTimeslot( appointment.getBookTimeslot() );
- queueSaveReqVO.setBookCheckType( appointment.getBookCheckType() );
- queueSaveReqVO.setPassed((byte)0);
- queueSaveReqVO.setExpired((byte)0);
- queueService.queue(queueSaveReqVO);
+ try {
+ QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
+ queueSaveReqVO.setPatId(appointment.getPatId());
+ queueSaveReqVO.setPatName(appointment.getPatName());
+ queueSaveReqVO.setPatGender(appointment.getPatGender());
+ queueSaveReqVO.setBookDate(appointment.getBookDate());
+ queueSaveReqVO.setBookTimeslot(appointment.getBookTimeslot());
+ queueSaveReqVO.setBookCheckType(appointment.getBookCheckType());
+ queueSaveReqVO.setPassed((byte) 0);
+ queueSaveReqVO.setExpired((byte) 0);
+ queueService.queue(queueSaveReqVO);
+ } catch (DuplicateKeyException duplicateKeyException) {
+ return success("鎮ㄥ凡缁忓湪鎺掗槦涓簡");
+ }
return success("hello");
}
diff --git a/sql/mysql/jh.sql b/sql/mysql/jh.sql
index cf4c45f..aa49538 100644
--- a/sql/mysql/jh.sql
+++ b/sql/mysql/jh.sql
@@ -43,33 +43,33 @@
-- ----------------------------
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(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='鎺掗槦琛�';
-
+ `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`),
+ UNIQUE KEY `unique_pat_id` (`pat_id`) USING BTREE,
+ 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=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鎺掗槦琛�';
-- ----------------------------
-- Table structure for clinic_room
--
Gitblit v1.9.3