From ac50e4c2619038c698d3002ebd0ea395402bf1bb Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Thu, 2 Apr 2026 13:32:03 +0700
Subject: [PATCH] update: pharmacy order list

---
 src/entity/emr/emr_pharmacy_order_list.ts | 34 ++++++++++-------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/entity/emr/emr_pharmacy_order_list.ts b/src/entity/emr/emr_pharmacy_order_list.ts
index dbef3a7..920ddb8 100644
--- a/src/entity/emr/emr_pharmacy_order_list.ts
+++ b/src/entity/emr/emr_pharmacy_order_list.ts
@@ -12,7 +12,6 @@ import {
     JoinTable
 } from "typeorm";
 
-import { EmrRegistrationOutpatient } from "./emr_registration_outpatient";
 import { EmrCompoundingMedicine } from "./emr_compounding_medicine";
 import { EmrPrescription } from "./emr_prescription";
 import { User } from "../users";
@@ -27,6 +26,20 @@ export class EmrPharmacyOrderList {
     @PrimaryGeneratedColumn("uuid")
     id: string;
 
+    @ManyToMany(() => EmrCompoundingMedicine)
+    @JoinTable({
+        name: "emr_pharmacy_order_list_compounding", // bebas, tapi konsisten
+        joinColumn: {
+            name: "pharmacy_order_list_id",
+            referencedColumnName: "id",
+        },
+        inverseJoinColumn: {
+            name: "compounding_medicine_id",
+            referencedColumnName: "id",
+        },
+    })
+    emrcompoundingmedicines: EmrCompoundingMedicine[];
+
     @Column({ nullable: true })
     order_date: Date;
 
@@ -42,25 +55,6 @@ export class EmrPharmacyOrderList {
     @Column({ nullable: true, type: "text", array: true })
     prescription_screening: string[];
 
-    @ManyToOne(() => EmrRegistrationOutpatient, { onDelete: "CASCADE" })
-    @JoinColumn()
-    emrregistrationoutpatient: EmrRegistrationOutpatient;
-
-    @Column({
-        type: 'text',
-        nullable: true,
-        array: true,
-    })
-    emrcompoundingmedicine: string[];
-
-    @ManyToMany(() => EmrCompoundingMedicine)
-    @JoinTable({
-        name: "compounding_medicine_order_list",
-        joinColumn: { name: "emr_pharmacy_order_list_id", referencedColumnName: "id" },
-        inverseJoinColumn: { name: "emr_compounding_medicine_id", referencedColumnName: "id" },
-    })
-    emrcompoundingmedicines: EmrCompoundingMedicine[];
-
     @ManyToOne(() => EmrPrescription, { onDelete: "CASCADE" })
     @JoinColumn()
     emrprescription: EmrPrescription;