Support exact match on AccessionNumber in C-FIND query

Author: steventux

src/services/mwl/c_find.py

@@ -44,13 +44,19 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
         procedure_sequence = identifier.get("ScheduledProcedureStepSequence", [{}])
         query_modality = procedure_sequence[0].get("Modality")
         query_date = procedure_sequence[0].get("ScheduledProcedureStepStartDate")
+        query_accession_number = identifier.get("AccessionNumber")
 
         logger.debug(
-            "Query parameters: modality=%s, date=%s, patient_id=%s", query_modality, query_date, anonymised_patient_id
+            "Query parameters: accession_number=%s, modality=%s, date=%s, patient_id=%s",
+            query_accession_number,
+            query_modality,
+            query_date,
+            anonymised_patient_id,
         )
 
         try:
             items = self.storage.find_worklist_items(
+                accession_number=query_accession_number if query_accession_number else None,
                 modality=query_modality if query_modality else None,
                 scheduled_date=query_date if query_date else None,
                 patient_id=query_patient_id if query_patient_id else None,

tests/integration/test_c_find_returns_worklist_items.py

@@ -116,6 +116,23 @@ def test_cfind_filters_by_scheduled_date(self, event, storage):
         assert status == SUCCESS
         assert ds is None
 
+    def test_cfind_filters_by_accession_number(self, event, storage):
+        event.identifier.AccessionNumber = "ACC234567"
+
+        results = list(CFind(storage).call(event))
+
+        assert len(results) == 2
+
+        status, ds = results[0]
+        assert status == PENDING
+        assert ds.PatientID == "999234567"
+        assert ds.PatientName == "JONES^MARY"
+        assert ds.AccessionNumber == "ACC234567"
+
+        status, ds = results[1]
+        assert status == SUCCESS
+        assert ds is None
+
     def test_cfind_filters_by_modality(self, event, storage):
         storage.store_worklist_item(
             WorklistItem(

tests/services/mwl/test_c_find.py

@@ -107,6 +107,16 @@ def test_call_with_multiple_results(self, handler, mock_storage, mock_event):
         status, ds = results[3]
         assert status == SUCCESS
 
+    def test_call_with_accession_number_filter(self, handler, mock_storage, mock_event):
+        mock_event.identifier.AccessionNumber = "ACC12345"
+        mock_storage.find_worklist_items.return_value = []
+
+        list(handler.call(mock_event))
+
+        mock_storage.find_worklist_items.assert_called_once_with(
+            accession_number="ACC12345", modality=None, scheduled_date=None, patient_id=None
+        )
+
     def test_call_with_modality_filter(self, handler, mock_storage, mock_event):
         # Add modality to query
         sps_item = Dataset()
@@ -116,7 +126,9 @@ def test_call_with_modality_filter(self, handler, mock_storage, mock_event):
 
         list(handler.call(mock_event))
 
-        mock_storage.find_worklist_items.assert_called_once_with(modality="MG", scheduled_date=None, patient_id=None)
+        mock_storage.find_worklist_items.assert_called_once_with(
+            accession_number=None, modality="MG", scheduled_date=None, patient_id=None
+        )
 
     def test_call_with_date_filter(self, handler, mock_storage, mock_event):
         sps_item = Dataset()
@@ -127,7 +139,7 @@ def test_call_with_date_filter(self, handler, mock_storage, mock_event):
         list(handler.call(mock_event))
 
         mock_storage.find_worklist_items.assert_called_once_with(
-            modality=None, scheduled_date="20260107", patient_id=None
+            accession_number=None, modality=None, scheduled_date="20260107", patient_id=None
         )
 
     def test_call_with_patient_id_filter(self, handler, mock_storage, mock_event):
@@ -137,7 +149,7 @@ def test_call_with_patient_id_filter(self, handler, mock_storage, mock_event):
         list(handler.call(mock_event))
 
         mock_storage.find_worklist_items.assert_called_once_with(
-            modality=None, scheduled_date=None, patient_id="9876543210"
+            accession_number=None, modality=None, scheduled_date=None, patient_id="9876543210"
         )
 
     def test_call_handles_storage_exception(self, handler, mock_storage, mock_event):

tests/services/test_storage.py

@@ -260,7 +260,9 @@ def test_find_worklist_items_with_multiple_filters(self, mock_db, tmp_dir):
 
         subject = MWLStorage(tmp_dir)
         mock_connection.reset_mock()
-        subject.find_worklist_items(accession_number="ACC123456", modality="MG", scheduled_date="20240101", patient_id="999123456")
+        subject.find_worklist_items(
+            accession_number="ACC123456", modality="MG", scheduled_date="20240101", patient_id="999123456"
+        )
 
         mock_connection.execute.assert_called_once_with(
             (