From 1aedea7b5f191d66e96b5f7555965df4de958de3 Mon Sep 17 00:00:00 2001 From: avicenan Date: Tue, 7 Apr 2026 17:54:53 +0700 Subject: [PATCH] fix: add queue number on pharmacy order --- src/entity/emr/emr_pharmacy_order.ts | 5 ++++- src/types/pharmacy_order_status.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/entity/emr/emr_pharmacy_order.ts b/src/entity/emr/emr_pharmacy_order.ts index 734d7b1..efb33f6 100644 --- a/src/entity/emr/emr_pharmacy_order.ts +++ b/src/entity/emr/emr_pharmacy_order.ts @@ -19,7 +19,7 @@ import { EmrPatient } from "./emr_patient"; import { PharmacyOrderStatus } from "../../types/pharmacy_order_status"; @Entity("emr_pharmacy_order", { schema: "emr" }) -@Index(["code"], { unique: true }) +@Index(["code", "queue_number"], { unique: true }) export class EmrPharmacyOrder { @PrimaryGeneratedColumn("uuid") id: string; @@ -27,6 +27,9 @@ export class EmrPharmacyOrder { @Column({ type: "varchar", unique: true }) code: string; + @Column({ nullable: true, type: "varchar", length: 256, unique: true }) + queue_number?: string; + @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" }) @JoinColumn({ name: "registration_id" }) registration: EmrRegistration | null; diff --git a/src/types/pharmacy_order_status.ts b/src/types/pharmacy_order_status.ts index c9f57a0..77e77ea 100644 --- a/src/types/pharmacy_order_status.ts +++ b/src/types/pharmacy_order_status.ts @@ -8,8 +8,8 @@ */ export enum PharmacyOrderStatus { WAITING = "waiting", - PREPARING = "preparing", - READY = "ready", + ORDERED = "ordered", + VERIFIED = "verified", COMPLETED = "completed", CANCELED = "canceled", }