From 200dcfa075ef3447879b1ef5931afdd19ac0d9f7 Mon Sep 17 00:00:00 2001
From: avicenan <avicena.n@gmail.com>
Date: Thu, 9 Apr 2026 09:59:59 +0700
Subject: [PATCH] fix pharmacy order activity

---
 src/entity/emr/emr_pharmacy_order.ts          |  4 ---
 src/entity/emr/emr_pharmacy_order_activity.ts | 33 +++++++++++++++++--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/entity/emr/emr_pharmacy_order.ts b/src/entity/emr/emr_pharmacy_order.ts
index 9f6e12c..9655d8a 100644
--- a/src/entity/emr/emr_pharmacy_order.ts
+++ b/src/entity/emr/emr_pharmacy_order.ts
@@ -90,7 +90,3 @@ export class EmrPharmacyOrder {
     deleted_by: string;
 }
 
-function Sequence(arg0: string): (target: EmrPharmacyOrder, propertyKey: "order_number") => void {
-    throw new Error("Function not implemented.");
-}
-
diff --git a/src/entity/emr/emr_pharmacy_order_activity.ts b/src/entity/emr/emr_pharmacy_order_activity.ts
index cebf275..2ab6154 100644
--- a/src/entity/emr/emr_pharmacy_order_activity.ts
+++ b/src/entity/emr/emr_pharmacy_order_activity.ts
@@ -11,11 +11,38 @@ export class EmrPharmacyOrderActivity {
     @JoinColumn({ name: "pharmacy_order_id" })
     pharmacy_order: EmrPharmacyOrder;
 
-    @Column({ nullable: false, type: "text" })
-    activity: PharmacyOrderStatus;
+    @Column({ type: "varchar", unique: true })
+    code: string;
+
+    @Column({ nullable: true, type: "varchar", length: 256, unique: true })
+    queue_number?: string | null;
 
     @Column({ nullable: true, type: "text" })
-    description: string;
+    doctor: string | null;
+
+    @Column({ nullable: true, type: "text" })
+    patient: string | null;
+
+    @Column({ nullable: true, type: "jsonb" })
+    compounding_medicines: object | null;
+
+    @Column({ nullable: true, type: "jsonb" })
+    prescriptions: object | null;
+
+    @Column({ nullable: true, type: "text" })
+    room: string | null;
+
+    @Column({ nullable: true, type: "text" })
+    referring_room: string | null;
+
+    @Column({ nullable: true, type: "jsonb" })
+    prescription_screening?: object | null;
+
+    @Column({ type: "enum", enum: PharmacyOrderStatus })
+    status: PharmacyOrderStatus;
+
+    @Column({ nullable: true, type: "float" })
+    subtotal_price?: number | null;
 
     @Column()
     @CreateDateColumn()