From d2adb7242f849aefbe79886b292fedc247434e95 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Tue, 31 Mar 2026 10:39:21 +0700 Subject: [PATCH] update: order for compounding medicine, now ir can be ordered different compounding --- src/entity/emr/emr_pharmacy_order_list.ts | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/entity/emr/emr_pharmacy_order_list.ts b/src/entity/emr/emr_pharmacy_order_list.ts index f7f8245..dbef3a7 100644 --- a/src/entity/emr/emr_pharmacy_order_list.ts +++ b/src/entity/emr/emr_pharmacy_order_list.ts @@ -7,7 +7,9 @@ import { DeleteDateColumn, OneToMany, ManyToOne, - JoinColumn + JoinColumn, + ManyToMany, + JoinTable } from "typeorm"; import { EmrRegistrationOutpatient } from "./emr_registration_outpatient"; @@ -44,9 +46,20 @@ export class EmrPharmacyOrderList { @JoinColumn() emrregistrationoutpatient: EmrRegistrationOutpatient; - @ManyToOne(() => EmrCompoundingMedicine, { onDelete: "CASCADE" }) - @JoinColumn() - emrcompoundingmedicine: EmrCompoundingMedicine; + @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()