diff --git a/src/entity/emr/emr_pharmacy_order_list.ts b/src/entity/emr/emr_pharmacy_order_list.ts
new file mode 100644
index 0000000..f7f8245
--- /dev/null
+++ b/src/entity/emr/emr_pharmacy_order_list.ts
@@ -0,0 +1,96 @@
+import {
+    Entity,
+    PrimaryGeneratedColumn,
+    Column,
+    CreateDateColumn,
+    UpdateDateColumn,
+    DeleteDateColumn,
+    OneToMany,
+    ManyToOne,
+    JoinColumn
+} from "typeorm";
+
+import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
+import { EmrCompoundingMedicine } from "./emr_compounding_medicine";
+import { EmrPrescription } from "./emr_prescription";
+import { User } from "../users";
+import { PatientGuarantor } from "../patient_guarantor";
+import { Room } from "../room";
+import { Department } from "../department";
+import { EmrRegistration } from "./emr_registration";
+
+
+@Entity("emr_pharmacy_order_list", { schema: "emr" })
+export class EmrPharmacyOrderList {
+    @PrimaryGeneratedColumn("uuid")
+    id: string;
+
+    @Column({ nullable: true })
+    order_date: Date;
+
+    @Column({ nullable: true, type: "text" })
+    prescription_number: string;
+
+    @Column({ nullable: true, type: "text" })
+    type: string;
+
+    @Column({ nullable: true, type: "text" })
+    status: string;
+
+    @Column({ nullable: true, type: "text", array: true })
+    prescription_screening: string[];
+
+    @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" })
+    @JoinColumn()
+    emrregistrationoutpatient: EmrRegistrationOutpatient;
+
+    @ManyToOne(() => EmrCompoundingMedicine, { onDelete: "CASCADE" })
+    @JoinColumn()
+    emrcompoundingmedicine: EmrCompoundingMedicine;
+
+    @ManyToOne(() => EmrPrescription, { onDelete: "CASCADE" })
+    @JoinColumn()
+    emrprescription: EmrPrescription;
+
+    @ManyToOne(() => User, { onDelete: "CASCADE" })
+    @JoinColumn()
+    user: User;
+
+    @ManyToOne(() => PatientGuarantor, { onDelete: "CASCADE" })
+    @JoinColumn()
+    patientguarantor: PatientGuarantor;
+
+    @ManyToOne(() => Room, { onDelete: "CASCADE" })
+    @JoinColumn()
+    room: Room;
+
+    @ManyToOne(() => Department, { onDelete: "CASCADE" })
+    @JoinColumn()
+    department: Department;
+
+    @ManyToOne(() => EmrRegistration, { onDelete: "CASCADE" })
+    @JoinColumn()
+    emrregistration: EmrRegistration;
+
+    @Column()
+    @CreateDateColumn()
+    created_at: Date;
+
+    @Column({ nullable: true, length: 256 })
+    created_by: string;
+
+    @Column({ nullable: true })
+    @UpdateDateColumn()
+    updated_at: Date;
+
+    @Column({ nullable: true, length: 256 })
+    updated_by: string;
+
+    @Column({ nullable: true })
+    @DeleteDateColumn()
+    deleted_at: Date;
+
+    @Column({ nullable: true, length: 256 })
+    deleted_by: string;
+}
+
diff --git a/src/entity/pharmacy-logistic/delivery_room.ts b/src/entity/pharmacy-logistic/delivery_room.ts
index eeba02d..9e059c3 100644
--- a/src/entity/pharmacy-logistic/delivery_room.ts
+++ b/src/entity/pharmacy-logistic/delivery_room.ts
@@ -29,7 +29,6 @@ export class DeliveryRoom {
     @JoinColumn()
     destinationroom: Room;
 
-
     @ManyToOne(() => RoomOrder, { onDelete: "NO ACTION" })
     @JoinColumn()
     roomorder: RoomOrder;
diff --git a/src/schema/emr.ts b/src/schema/emr.ts
index 59731b9..60bd734 100644
--- a/src/schema/emr.ts
+++ b/src/schema/emr.ts
@@ -25,6 +25,7 @@ export * from "../entity/emr/emr_compounding_medicine";
 export * from "../entity/emr/emr_compounding_medicine_item";
 export * from "../entity/emr/emr_room_medical_equipment";
 export * from "../entity/emr/emr_external_consultation";
+export * from "../entity/emr/emr_pharmacy_order_list";
 
 export * from "../types/registration_type";
 export * from "../types/registration_status";