diff --git a/src/entity/emr/emr_pharmacy_order_activity.ts b/src/entity/emr/emr_pharmacy_order_activity.ts
index 2ab6154..2d4e188 100644
--- a/src/entity/emr/emr_pharmacy_order_activity.ts
+++ b/src/entity/emr/emr_pharmacy_order_activity.ts
@@ -1,13 +1,13 @@
-import { Column, CreateDateColumn, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
+import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
 import { EmrPharmacyOrder } from "./emr_pharmacy_order";
 import { PharmacyOrderStatus } from "../../types/pharmacy_order_status";
-import { User } from "../users";
 
+@Entity("emr_pharmacy_order_activity", { schema: "emr" })
 export class EmrPharmacyOrderActivity {
     @PrimaryGeneratedColumn("uuid")
     id: string;
 
-    @ManyToOne(() => EmrPharmacyOrder, { onDelete: "CASCADE" })
+    @ManyToOne(() => EmrPharmacyOrder, (order) => order.activities, { onDelete: "CASCADE" })
     @JoinColumn({ name: "pharmacy_order_id" })
     pharmacy_order: EmrPharmacyOrder;
 
diff --git a/src/types/pharmacy_order_status.ts b/src/types/pharmacy_order_status.ts
index 8319ace..96e9a26 100644
--- a/src/types/pharmacy_order_status.ts
+++ b/src/types/pharmacy_order_status.ts
@@ -5,7 +5,7 @@
  * Verified: order diverifikasi oleh farmasi
  * Compounding: order diracik oleh farmasi
  * Packaging: order dibungkus oleh farmasi
- * Dispensed: order diberikan kepada pasien
+ * Submitted: order diserahkan kepada pasien
  * Canceled: order dibatalkan
  */
 export enum PharmacyOrderStatus {
@@ -14,7 +14,7 @@ export enum PharmacyOrderStatus {
     VERIFIED = "verified",
     COMPOUNDING = "compounding",
     PACKAGING = "packaging",
-    DISPENSED = "dispensed",
+    SUBMITTED = "submitted",
     CANCELED = "canceled",
 }