fixed migration conflicts

care/emr/migrations/0057_merge_0046_merge_20241227_1152_0056_fileupload.py

@@ -0,0 +1,14 @@
+# Generated by Django 5.1.3 on 2024-12-29 07:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('emr', '0046_merge_20241227_1152'),
+        ('emr', '0056_fileupload'),
+    ]
+
+    operations = [
+    ]

care/emr/migrations/0058_alter_medicationadministration_encounter_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.3 on 2024-12-29 08:02
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('emr', '0057_merge_0046_merge_20241227_1152_0056_fileupload'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='medicationadministration',
+            name='encounter',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='emr.encounter'),
+        ),
+        migrations.AlterField(
+            model_name='medicationadministration',
+            name='patient',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='emr.patient'),
+        ),
+    ]

care/emr/models/medication_administration.py

@@ -10,11 +10,9 @@ class MedicationAdministration(EMRBaseModel):
     status_reason = models.JSONField(null=True, blank=True)
     category = models.CharField(max_length=100, null=True, blank=True)
     medication = models.JSONField(default=dict)
-    patient = models.ForeignKey(
-        "facility.PatientRegistration", on_delete=models.CASCADE
-    )
+    patient = models.ForeignKey("emr.Patient", on_delete=models.CASCADE)
     encounter = models.ForeignKey(
-        "facility.PatientConsultation", on_delete=models.CASCADE, null=True, blank=True
+        "emr.Encounter", on_delete=models.CASCADE, null=True, blank=True
     )
     request = models.ForeignKey(
         "emr.MedicationRequest", on_delete=models.CASCADE, null=True, blank=True