Merge 952cbce into e3b93f0

openhealthcare · Apr 7, 2020 · 59b4fb3 · 59b4fb3
2 parents e3b93f0 + 952cbce
commit 59b4fb3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/elcid/models.py b/elcid/models.py
@@ -397,7 +397,7 @@ def to_dict(self, *args, **kwargs):
         if MicroInputICURoundRelation.objects.filter(microbiology_input_id=self.id).exists():
             result["micro_input_icu_round_relation"] = self.microinputicuroundrelation.to_dict(*args, **kwargs)
         else:
-            result["micro_input_icu_round_relation"] = {}
+            result["micro_input_icu_round_relation"] = MicroInputICURoundRelation().to_dict()
         return result
 
     def update_from_dict(self, data, *args, **kwargs):

diff --git a/elcid/test/test_models.py b/elcid/test/test_models.py
@@ -423,6 +423,15 @@ def test_to_dict(self):
             as_dict["micro_input_icu_round_relation"]["icu_round"]["sofa_score"]
         )
 
+    def test_to_dict_for_no_icu_round(self):
+        micro_input = emodels.MicrobiologyInput.objects.create(
+            episode=self.episode,
+            clinical_discussion="some discussion"
+        )
+        as_dict = micro_input.to_dict(None)
+        self.assertEqual(as_dict["micro_input_icu_round_relation"]["observation"], {})
+        self.assertEqual(as_dict["micro_input_icu_round_relation"]["icu_round"], {})
+
     def test_delete_with_icu_round(self):
         micro_input = emodels.MicrobiologyInput.objects.create(
             episode=self.episode,