fixes a bug where we are generating the summary based on patient id n…

…ot episode id...

opal/core/search/tests/test_views.py

@@ -223,6 +223,33 @@ def test_number_of_queries(self):
         with self.assertNumQueries(35):
             self.get_response('{}/?query=Blofelt'.format(self.url))
 
+    def test_with_multiple_patient_episodes(self):
+        self.patient.create_episode()
+        blofeld_patient, blofeld_episode = self.create_patient(
+            "Ernst", "Blofeld", "23422"
+        )
+        response = json.loads(
+            self.get_response('{}/?query=Blofeld'.format(self.url)).content
+        )
+        expected = {
+            "total_pages": 1,
+            "object_list": [{
+                "count": 1,
+                "first_name": "Ernst",
+                "surname": "Blofeld",
+                "start": None,
+                "patient_id": 2,
+                "hospital_number": "23422",
+                "date_of_birth": None,
+                "end": None,
+                "id": 2,
+                "categories": ["Inpatient"]
+            }],
+            "page_number": 1,
+            "total_count": 1
+        }
+        self.assertEqual(response, expected)
+
 
 class SearchTemplateTestCase(OpalTestCase):
 

opal/core/search/views.py

@@ -99,7 +99,7 @@ def simple_search_view(request):
     paginated = _add_pagination(patients, page_number)
     paginated_patients = paginated["object_list"]
     episodes = models.Episode.objects.filter(
-        id__in=paginated_patients.values_list("id", flat=True)
+        id__in=paginated_patients.values_list("episode__id", flat=True)
     )
     paginated["object_list"] = query.get_aggregate_patients_from_episodes(
         episodes