diff --git a/src/entity/emr/emr_emergency_transfer_attached_devices.ts b/src/entity/emr/emr_emergency_transfer_attached_devices.ts
index 2b38e7b..62a04e5 100644
--- a/src/entity/emr/emr_emergency_transfer_attached_devices.ts
+++ b/src/entity/emr/emr_emergency_transfer_attached_devices.ts
@@ -6,7 +6,7 @@ export class EmrEmergencyTransferAttachedDevice {
 	@PrimaryGeneratedColumn("uuid")
 	id: string;
 
-	@ManyToOne(() => EmrEmergencyTransfer, (transfer) => transfer.diagnostics, { onDelete: "NO ACTION" })
+	@ManyToOne(() => EmrEmergencyTransfer, { onDelete: "NO ACTION", nullable: true })
 	@JoinColumn()
 	emergency_transfer: EmrEmergencyTransfer;
 
diff --git a/src/entity/emr/emr_emergency_transfer_clinical_interventions.ts b/src/entity/emr/emr_emergency_transfer_clinical_interventions.ts
index 7b416eb..bedab36 100644
--- a/src/entity/emr/emr_emergency_transfer_clinical_interventions.ts
+++ b/src/entity/emr/emr_emergency_transfer_clinical_interventions.ts
@@ -6,10 +6,8 @@ export class EmrEmergencyTransferClinicalIntervention {
 	@PrimaryGeneratedColumn("uuid")
 	id: string;
 
-	@ManyToOne(() => EmrEmergencyTransfer, (transfer) => transfer.clinical_interventions, {
-		onDelete: "NO ACTION",
-	})
-	@JoinColumn({})
+	@ManyToOne(() => EmrEmergencyTransfer, { onDelete: "NO ACTION", nullable: true })
+	@JoinColumn()
 	emergency_transfer: EmrEmergencyTransfer;
 
 	@Column({ nullable: true, type: "varchar", length: 128 })
diff --git a/src/entity/emr/emr_emergency_transfer_diagnostics.ts b/src/entity/emr/emr_emergency_transfer_diagnostics.ts
index ded37eb..7f948cd 100644
--- a/src/entity/emr/emr_emergency_transfer_diagnostics.ts
+++ b/src/entity/emr/emr_emergency_transfer_diagnostics.ts
@@ -6,7 +6,7 @@ export class EmrEmergencyTransferDiagnostic {
 	@PrimaryGeneratedColumn("uuid")
 	id: string;
 
-	@ManyToOne(() => EmrEmergencyTransfer, (transfer) => transfer.diagnostics, { onDelete: "NO ACTION" })
+	@ManyToOne(() => EmrEmergencyTransfer, { onDelete: "NO ACTION", nullable: true })
 	@JoinColumn()
 	emergency_transfer: EmrEmergencyTransfer;
 
diff --git a/src/entity/emr/emr_emergency_transfer_medications.ts b/src/entity/emr/emr_emergency_transfer_medications.ts
index 51c9b9e..c997514 100644
--- a/src/entity/emr/emr_emergency_transfer_medications.ts
+++ b/src/entity/emr/emr_emergency_transfer_medications.ts
@@ -6,7 +6,7 @@ export class EmrEmergencyTransferMedication {
 	@PrimaryGeneratedColumn("uuid")
 	id: string;
 
-	@ManyToOne(() => EmrEmergencyTransfer, (transfer) => transfer.medications, { onDelete: "NO ACTION" })
+	@ManyToOne(() => EmrEmergencyTransfer, { onDelete: "NO ACTION", nullable: true })
 	@JoinColumn()
 	emergency_transfer: EmrEmergencyTransfer;
 
diff --git a/src/entity/emr/emr_emergency_transfers.ts b/src/entity/emr/emr_emergency_transfers.ts
index beae8e2..1e396e5 100644
--- a/src/entity/emr/emr_emergency_transfers.ts
+++ b/src/entity/emr/emr_emergency_transfers.ts
@@ -19,7 +19,7 @@ export class EmrEmergencyTransfer {
 
 	// Registrasi emergency yang memiliki transfer antar unit
 	@ManyToOne(() => EmrRegistration, { onDelete: "NO ACTION", nullable: true })
-	@JoinColumn({ name: "registration_id" })
+	@JoinColumn()
 	registration: EmrRegistration;
 
 	// Asal ruang rawat
@@ -59,8 +59,9 @@ export class EmrEmergencyTransfer {
 	primary_diagnosis: EmrDiagnosis;
 
 	// Diagnosis sekunder
-	@Column({ nullable: true, type: "text", array: true })
-	secondary_diagnoses: string[];
+	@ManyToOne(() => EmrDiagnosis, { onDelete: "NO ACTION" })
+	@JoinColumn()
+	secondary_diagnosis: EmrDiagnosis;
 
 	// Alasan pemindahan: kondisi memburuk / tidak stabil
 	@Column({ nullable: true, type: "boolean", default: false })
@@ -138,24 +139,6 @@ export class EmrEmergencyTransfer {
 	@Column({ nullable: true, type: "text" })
 	procedure: string;
 
-	// Turunan data pemeriksaan diagnostik
-	@OneToMany(() => EmrEmergencyTransferDiagnostic, (row) => row.emergency_transfer, { onDelete: "NO ACTION" })
-	diagnostics: EmrEmergencyTransferDiagnostic[];
-
-	// Turunan data obat yang diberikan saat transfer
-	@OneToMany(() => EmrEmergencyTransferMedication, (row) => row.emergency_transfer, { onDelete: "NO ACTION" })
-	medications: EmrEmergencyTransferMedication[];
-
-	// Turunan data alat yang terpasang di pasien
-	@OneToMany(() => EmrEmergencyTransferAttachedDevice, (row) => row.emergency_transfer, { onDelete: "NO ACTION" })
-	attached_devices: EmrEmergencyTransferAttachedDevice;
-
-	// Turunan data tindakan klinis (infus, oksigen, dll)
-	@OneToMany(() => EmrEmergencyTransferClinicalIntervention, (row) => row.emergency_transfer, {
-		onDelete: "NO ACTION",
-	})
-	clinical_interventions: EmrEmergencyTransferClinicalIntervention[];
-
 	@Column()
 	@CreateDateColumn()
 	created_at: Date;