Support scheduled procedure step time on C-FIND service class calls

Author: steventux

src/services/mwl/c_find.py

@@ -39,20 +39,17 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
         logger.info(f"C-FIND request from {requestor_aet}")
 
         query_patient_id = identifier.get("PatientID")
-        anonymised_patient_id = f"*******{query_patient_id[7:]}" if query_patient_id else "None"
 
         procedure_sequence = identifier.get("ScheduledProcedureStepSequence", [{}])
         query_modality = procedure_sequence[0].get("Modality")
         query_date = procedure_sequence[0].get("ScheduledProcedureStepStartDate")
-
-        logger.debug(
-            "Query parameters: modality=%s, date=%s, patient_id=%s", query_modality, query_date, anonymised_patient_id
-        )
+        query_time = procedure_sequence[0].get("ScheduledProcedureStepStartTime")
 
         try:
             items = self.storage.find_worklist_items(
                 modality=query_modality if query_modality else None,
                 scheduled_date=query_date if query_date else None,
+                scheduled_time=query_time if query_time else None,
                 patient_id=query_patient_id if query_patient_id else None,
             )
 

tests/integration/test_c_find_returns_worklist_items.py

@@ -156,6 +156,88 @@ def test_cfind_filters_by_after_scheduled_date(self, event, storage):
         assert status == SUCCESS
         assert ds is None
 
+    def test_cfind_filters_by_scheduled_time_range(self, event, storage):
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime = "090000-093000"
+
+        results = list(CFind(storage).call(event))
+
+        assert len(results) == 2
+
+        status, ds = results[0]
+        assert status == PENDING
+        assert ds.PatientID == "999123456"
+        assert ds.PatientName == "SMITH^JANE"
+        assert ds.PatientBirthDate == "19800101"
+        assert ds.AccessionNumber == "ACC123456"
+        assert ds.ScheduledProcedureStepSequence[0].Modality == "MG"
+        assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime == "090000"
+
+        status, ds = results[1]
+        assert status == SUCCESS
+        assert ds is None
+
+    def test_cfind_filters_by_before_scheduled_time(self, event, storage):
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime = "-093000"
+
+        results = list(CFind(storage).call(event))
+
+        assert len(results) == 2
+
+        status, ds = results[0]
+        assert status == PENDING
+        assert ds.PatientID == "999123456"
+        assert ds.PatientName == "SMITH^JANE"
+        assert ds.PatientBirthDate == "19800101"
+        assert ds.AccessionNumber == "ACC123456"
+        assert ds.ScheduledProcedureStepSequence[0].Modality == "MG"
+        assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime == "090000"
+
+        status, ds = results[1]
+        assert status == SUCCESS
+        assert ds is None
+
+    def test_cfind_filters_by_after_scheduled_time(self, event, storage):
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime = "093000-"
+
+        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.PatientBirthDate == "19900202"
+        assert ds.AccessionNumber == "ACC234567"
+        assert ds.ScheduledProcedureStepSequence[0].Modality == "MG"
+        assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime == "094500"
+
+        status, ds = results[1]
+        assert status == SUCCESS
+        assert ds is None
+
+    def test_cfind_filters_by_date_and_time_range(self, event, storage):
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate = "20240101-20240201"
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime = "090000-093000"
+
+        results = list(CFind(storage).call(event))
+
+        assert len(results) == 2
+
+        status, ds = results[0]
+        assert status == PENDING
+        assert ds.PatientID == "999123456"
+        assert ds.PatientName == "SMITH^JANE"
+        assert ds.PatientBirthDate == "19800101"
+        assert ds.AccessionNumber == "ACC123456"
+        assert ds.ScheduledProcedureStepSequence[0].Modality == "MG"
+        assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate == "20240101"
+        assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime == "090000"
+
+        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

@@ -116,7 +116,7 @@ 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(modality="MG", scheduled_date=None, scheduled_time=None, patient_id=None)
 
     def test_call_with_date_filter(self, handler, mock_storage, mock_event):
         sps_item = Dataset()
@@ -127,7 +127,19 @@ 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
+            modality=None, scheduled_date="20260107", scheduled_time=None, patient_id=None
+        )
+
+    def test_call_with_time_filter(self, handler, mock_storage, mock_event):
+        sps_item = Dataset()
+        sps_item.ScheduledProcedureStepStartTime = "100000"
+        mock_event.identifier.ScheduledProcedureStepSequence = [sps_item]
+        mock_storage.find_worklist_items.return_value = []
+
+        list(handler.call(mock_event))
+
+        mock_storage.find_worklist_items.assert_called_once_with(
+            modality=None, scheduled_date=None, scheduled_time="100000", 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"
+            modality=None, scheduled_date=None, scheduled_time=None, patient_id="9876543210"
         )
 
     def test_call_handles_storage_exception(self, handler, mock_storage, mock_event):