Fix: 门诊预约挂号→签到→退号 slot/pool 状态流转对齐需求
- 枚举重排: SlotStatus LOCKED=4→2, CANCELLED=2→4,匹配需求编号 - 预约: lockSlotForBooking 写入 LOCKED(2) 替代 BOOKED(1),pool locked_num+1 原子递增 - 签到: LOCKED(2)→BOOKED(1) 替代 CHECKED_IN(3),加前置状态校验 - 退号: 加 BOOKED(1) 前置校验 - 池计数: refreshPoolStats booked_num=COUNT(1), locked_num=COUNT(2) - SQL 状态值全部由 SlotStatus 枚举传入,消除硬编码 - 查询/显示: 加 locked 筛选分支,BOOKED→已取号, LOCKED→已锁定 - 前端常量同步,签到列表查询 book→locked
This commit is contained in:
@@ -172,12 +172,12 @@ export const SlotStatus = {
|
||||
AVAILABLE: 0,
|
||||
/** 已预约 */
|
||||
BOOKED: 1,
|
||||
/** 已取消 / 已停诊 */
|
||||
CANCELLED: 2,
|
||||
/** 已锁定 */
|
||||
LOCKED: 2,
|
||||
/** 已签到 / 已取号 */
|
||||
CHECKED_IN: 3,
|
||||
/** 已锁定 */
|
||||
LOCKED: 4,
|
||||
/** 已取消 / 已停诊 */
|
||||
CANCELLED: 4,
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -185,10 +185,10 @@ export const SlotStatus = {
|
||||
*/
|
||||
export const SlotStatusDescriptions = {
|
||||
0: '未预约',
|
||||
1: '已预约',
|
||||
2: '已停诊',
|
||||
1: '已取号',
|
||||
2: '已锁定',
|
||||
3: '已取号',
|
||||
4: '已锁定',
|
||||
4: '已停诊',
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
<select id="status-select" class="search-select" v-model="selectedStatus" @change="onSearch">
|
||||
<option value="all">全部</option>
|
||||
<option value="unbooked">未预约</option>
|
||||
<option value="locked">已锁定</option>
|
||||
<option value="booked">已预约</option>
|
||||
<option value="checked">已取号</option>
|
||||
<option value="cancelled">已停诊</option>
|
||||
@@ -253,6 +254,7 @@ import useUserStore from '@/store/modules/user';
|
||||
|
||||
const STATUS_CLASS_MAP = {
|
||||
'未预约': 'status-unbooked',
|
||||
'已锁定': 'status-locked',
|
||||
'已预约': 'status-booked',
|
||||
'已取号': 'status-checked',
|
||||
'已退号': 'status-returned',
|
||||
@@ -774,6 +776,7 @@ export default {
|
||||
// 🔧 BugFix#399: 确保已取号状态正确匹配
|
||||
const statusMap = {
|
||||
unbooked: ['未预约'],
|
||||
locked: ['已锁定'],
|
||||
booked: ['已预约'],
|
||||
checked: ['已取号', '已签到'],
|
||||
cancelled: ['已停诊', '已取消'],
|
||||
|
||||
@@ -1685,7 +1685,7 @@ function loadCheckInPatientList() {
|
||||
const today = formatDateStr(new Date(), 'YYYY-MM-DD');
|
||||
listTicket({
|
||||
date: today,
|
||||
status: 'booked',
|
||||
status: 'locked',
|
||||
name: checkInSearchKey.value, // 支持姓名等模糊查询,后端需适配
|
||||
page: checkInPage.value,
|
||||
limit: checkInLimit.value
|
||||
|
||||
Reference in New Issue
Block a user