From 6a4ed630d7bc1408bd97d75f114e695827ed14e7 Mon Sep 17 00:00:00 2001 From: avicenan Date: Thu, 9 Apr 2026 14:00:41 +0700 Subject: [PATCH] fix: pharmacy order status --- src/entity/emr/emr_pharmacy_order.ts | 2 +- src/entity/emr/emr_pharmacy_order_activity.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/entity/emr/emr_pharmacy_order.ts b/src/entity/emr/emr_pharmacy_order.ts index 83ab8a6..51cce34 100644 --- a/src/entity/emr/emr_pharmacy_order.ts +++ b/src/entity/emr/emr_pharmacy_order.ts @@ -66,7 +66,7 @@ export class EmrPharmacyOrder { @Column({ nullable: true, type: "float" }) subtotal_price?: number | null; - @OneToMany(() => EmrPharmacyOrderActivity, (activity) => activity.pharmacy_order, { cascade: true }) + @OneToMany(() => EmrPharmacyOrderActivity, (activity) => activity.pharmacy_order) activities: EmrPharmacyOrderActivity[]; @Column() diff --git a/src/entity/emr/emr_pharmacy_order_activity.ts b/src/entity/emr/emr_pharmacy_order_activity.ts index 6b42d55..860f27b 100644 --- a/src/entity/emr/emr_pharmacy_order_activity.ts +++ b/src/entity/emr/emr_pharmacy_order_activity.ts @@ -1,4 +1,4 @@ -import { Column, CreateDateColumn, Entity, JoinColumn, OneToMany, PrimaryGeneratedColumn } from "typeorm"; +import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm"; import { EmrPharmacyOrder } from "./emr_pharmacy_order"; import { PharmacyOrderStatus } from "../../types/pharmacy_order_status"; @@ -7,14 +7,14 @@ export class EmrPharmacyOrderActivity { @PrimaryGeneratedColumn("uuid") id: string; - @OneToMany(() => EmrPharmacyOrderActivity, (activity) => activity.pharmacy_order, { cascade: true }) + @ManyToOne(() => EmrPharmacyOrder, order => order.activities, { onDelete: 'NO ACTION' }) @JoinColumn({ name: "pharmacy_order_id" }) pharmacy_order: EmrPharmacyOrder; - @Column({ type: "varchar", unique: true }) + @Column({ type: "varchar" }) code: string; - @Column({ nullable: true, type: "varchar", length: 256, unique: true }) + @Column({ nullable: true, type: "varchar" }) queue_number?: string | null; @Column({ nullable: true, type: "text" })