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_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;
 
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,
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;