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:
@@ -768,36 +768,4 @@ public class CommonConstants {
|
||||
Integer ACCOUNT_DEVICE_TYPE = 6;
|
||||
}
|
||||
|
||||
/**
|
||||
* 号源槽位状态 (adm_schedule_slot.status)
|
||||
*/
|
||||
public interface SlotStatus {
|
||||
/** 可用 / 待预约 */
|
||||
Integer AVAILABLE = 0;
|
||||
/** 已预约 */
|
||||
Integer BOOKED = 1;
|
||||
/** 已取消 / 已停诊 */
|
||||
Integer CANCELLED = 2;
|
||||
/** 已签到 / 已取号 */
|
||||
Integer CHECKED_IN = 3;
|
||||
/** 已锁定 */
|
||||
Integer LOCKED = 4;
|
||||
/** 已退号 */
|
||||
Integer RETURNED = 5;
|
||||
}
|
||||
|
||||
/**
|
||||
* 预约订单状态 (order_main.status)
|
||||
*/
|
||||
public interface AppointmentOrderStatus {
|
||||
/** 已预约 (待就诊) */
|
||||
Integer BOOKED = 1;
|
||||
/** 已取号 (已就诊) */
|
||||
Integer CHECKED_IN = 2;
|
||||
/** 已取消 */
|
||||
Integer CANCELLED = 3;
|
||||
/** 已退号 */
|
||||
Integer RETURNED = 4;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.openhis.common.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 号源槽位状态 (adm_schedule_slot.status)
|
||||
*
|
||||
* <pre>
|
||||
* 状态流转:
|
||||
* 预约 → 0→2 (锁定), locked_num+1
|
||||
* 取消预约 → 2→0 (释放), locked_num-1
|
||||
* 签到 → 2→1 (已约), locked_num-1, booked_num+1
|
||||
* 退号 → 1→0 (释放), booked_num-1
|
||||
* 停诊 → 任意→4 (已取消)
|
||||
* </pre>
|
||||
*
|
||||
* @author system
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum SlotStatus implements HisEnumInterface {
|
||||
|
||||
/** 可用 / 待预约 */
|
||||
AVAILABLE(0, "available", "可用"),
|
||||
|
||||
/** 已预约 */
|
||||
BOOKED(1, "booked", "已预约"),
|
||||
|
||||
/** 已锁定 (约而不付:预约后锁定号源) */
|
||||
LOCKED(2, "locked", "已锁定"),
|
||||
|
||||
/** 已签到 / 已取号 */
|
||||
CHECKED_IN(3, "checked_in", "已签到"),
|
||||
|
||||
/** 已取消 / 已停诊 */
|
||||
CANCELLED(4, "cancelled", "已取消"),
|
||||
|
||||
/** 已退号 */
|
||||
RETURNED(5, "returned", "已退号");
|
||||
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
private final String info;
|
||||
|
||||
public static SlotStatus getByValue(Integer value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
for (SlotStatus val : values()) {
|
||||
if (val.getValue().equals(value)) {
|
||||
return val;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user