From c94966d39e7ad4b6b25b4483b9ea024fd57cded0 Mon Sep 17 00:00:00 2001 From: avicenan Date: Fri, 17 Apr 2026 13:47:53 +0700 Subject: [PATCH 1/3] fix(pharmacy-order): cacade on delete order activity --- src/entity/emr/emr_pharmacy_order_activity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entity/emr/emr_pharmacy_order_activity.ts b/src/entity/emr/emr_pharmacy_order_activity.ts index 860f27b..dbb88ad 100644 --- a/src/entity/emr/emr_pharmacy_order_activity.ts +++ b/src/entity/emr/emr_pharmacy_order_activity.ts @@ -7,7 +7,7 @@ export class EmrPharmacyOrderActivity { @PrimaryGeneratedColumn("uuid") id: string; - @ManyToOne(() => EmrPharmacyOrder, order => order.activities, { onDelete: 'NO ACTION' }) + @ManyToOne(() => EmrPharmacyOrder, order => order.activities, { onDelete: "CASCADE" }) @JoinColumn({ name: "pharmacy_order_id" }) pharmacy_order: EmrPharmacyOrder; From b2ab39bea0391c92fcee5206e7cf40744d47e155 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Fri, 17 Apr 2026 13:53:50 +0700 Subject: [PATCH 2/3] update --- src/entity/emr/emr_registration_emergency.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/entity/emr/emr_registration_emergency.ts b/src/entity/emr/emr_registration_emergency.ts index 7450618..1164aa9 100644 --- a/src/entity/emr/emr_registration_emergency.ts +++ b/src/entity/emr/emr_registration_emergency.ts @@ -67,9 +67,6 @@ export class EmrRegistrationEmergency { @Column({ nullable: true, type: "text" }) howtocome: string; - @Column({ nullable: true, type: "text" }) - casedefinition: string; - @Column({ type: 'text', nullable: true, From b57b7c61155baf909d22a9c09dfc81c237464532 Mon Sep 17 00:00:00 2001 From: avicenan Date: Fri, 17 Apr 2026 14:15:20 +0700 Subject: [PATCH 3/3] feat(registration): add queue at column in reg outpatient --- src/entity/emr/emr_pharmacy_order.ts | 2 +- src/entity/emr/emr_registration_outpatient.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/entity/emr/emr_pharmacy_order.ts b/src/entity/emr/emr_pharmacy_order.ts index 3a66d6e..a323da7 100644 --- a/src/entity/emr/emr_pharmacy_order.ts +++ b/src/entity/emr/emr_pharmacy_order.ts @@ -70,7 +70,7 @@ export class EmrPharmacyOrder { activities: EmrPharmacyOrderActivity[]; @Column({ nullable: true }) - queued_at?: Date | null; + queued_at?: Date; @Column() @CreateDateColumn() diff --git a/src/entity/emr/emr_registration_outpatient.ts b/src/entity/emr/emr_registration_outpatient.ts index f17c64a..31d2fbe 100644 --- a/src/entity/emr/emr_registration_outpatient.ts +++ b/src/entity/emr/emr_registration_outpatient.ts @@ -34,7 +34,7 @@ export class EmrRegistrationOutpatient { @JoinColumn() registration: EmrRegistration; - @ManyToOne(() => PatientGuarantor, { onDelete: "NO ACTION" }) + @ManyToOne(() => PatientGuarantor, { onDelete: "NO ACTION" }) @JoinColumn() guarantor: PatientGuarantor; @@ -76,6 +76,9 @@ export class EmrRegistrationOutpatient { @JoinColumn() ref_consultation: EmrInternalConsultation | null; + @Column({ nullable: true }) + queued_at?: Date; + @Column() @CreateDateColumn() created_at: Date;