Support date ranges in C-FIND query identifier

Conformance to DICOM Scheduled Procedure Step Start Date means support for date ranges.
If the query param is '*' matches on any date will be returned.
If the query param starts with '-' matches on records until the date param will be returned.
If the query param ends with '-' matches on records on and after the date param will be returned.
If the query param contains '-' between two date params, records between and including the two dates will be returned.

Author: steventux

src/services/storage.py

@@ -373,7 +373,7 @@ def find_worklist_items(
 
         Args:
             modality: Filter by modality (e.g., "MG")
-            scheduled_date: Filter by scheduled date (YYYYMMDD)
+            scheduled_date: Filter by scheduled date (YYYYMMDD, or range like "20240101-20240131")
             patient_id: Filter by patient ID
 
         Returns:
@@ -393,8 +393,19 @@ def find_worklist_items(
             params.append(modality)
 
         if scheduled_date:
-            where_clauses.append("scheduled_date = ?")
-            params.append(scheduled_date)
+            if scheduled_date.endswith("-"):
+                where_clauses.append("scheduled_date >= ?")
+                params.append(scheduled_date[:-1].strip())
+            elif scheduled_date.startswith("-"):
+                where_clauses.append("scheduled_date <= ?")
+                params.append(scheduled_date[1:].strip())
+            elif "-" in scheduled_date:
+                start_date, end_date = [s.strip() for s in scheduled_date.split("-", 1)]
+                where_clauses.append("scheduled_date >= ? AND scheduled_date <= ?")
+                params.extend([start_date, end_date])
+            else:
+                where_clauses.append("scheduled_date = ?")
+                params.append(scheduled_date.strip())
 
         if patient_id:
             where_clauses.append("patient_id = ?")

tests/integration/test_c_find_returns_worklist_items.py

@@ -40,7 +40,7 @@ def with_worklist_items(self, storage):
                 patient_name="JONES^MARY",
                 patient_birth_date="19900202",
                 patient_sex="F",
-                scheduled_date="20240102",
+                scheduled_date="20240302",
                 scheduled_time="094500",
                 modality="MG",
                 procedure_code="12345-6",
@@ -89,15 +89,15 @@ def test_cfind_returns_scheduled_items(self, event, storage):
         assert ds.StudyDescription == "MAMMOGRAPHY"
         assert ds.ScheduledProcedureStepSequence[0].Modality == "MG"
         assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepDescription == "MAMMOGRAPHY"
-        assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate == "20240102"
+        assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate == "20240302"
         assert ds.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartTime == "094500"
 
         status, ds = results[2]
         assert status == SUCCESS
         assert ds is None
 
-    def test_cfind_filters_by_scheduled_date(self, event, storage):
-        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate = "20240101"
+    def test_cfind_filters_by_scheduled_date_range(self, event, storage):
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate = "20240101-20240201"
 
         results = list(CFind(storage).call(event))
 
@@ -116,6 +116,46 @@ def test_cfind_filters_by_scheduled_date(self, event, storage):
         assert status == SUCCESS
         assert ds is None
 
+    def test_cfind_filters_by_before_scheduled_date(self, event, storage):
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate = "-20240101"
+
+        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"
+
+        status, ds = results[1]
+        assert status == SUCCESS
+        assert ds is None
+
+    def test_cfind_filters_by_after_scheduled_date(self, event, storage):
+        event.identifier.ScheduledProcedureStepSequence[0].ScheduledProcedureStepStartDate = "20240201-"
+
+        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].ScheduledProcedureStepStartDate == "20240302"
+
+        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/test_storage.py

@@ -283,6 +283,67 @@ def test_find_worklist_items_with_filters(self, mock_db, tmp_dir):
             ["MG", "20240101", "999123456"],
         )
 
+    def test_find_worklist_items_with_date_range(self, mock_db, tmp_dir):
+        mock_cursor = MagicMock()
+        mock_cursor.fetchall.return_value = []
+        mock_connection = MagicMock()
+        mock_connection.execute.return_value = mock_cursor
+        mock_db.connect.return_value = mock_connection
+
+        subject = MWLStorage(tmp_dir)
+        mock_connection.reset_mock()
+
+        subject.find_worklist_items(scheduled_date="20240101 - 20240131")
+
+        mock_connection.execute.assert_called_once_with(
+            (
+                "SELECT accession_number, modality, patient_birth_date, patient_id, "
+                "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
+                "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
+                "FROM worklist_items WHERE scheduled_date BETWEEN ? AND ? "
+                "ORDER BY scheduled_date, scheduled_time"
+            ),
+            ["20240101", "20240131"],
+        )
+
+    def test_find_worklist_items_with_open_ended_date_range(self, mock_db, tmp_dir):
+        mock_cursor = MagicMock()
+        mock_cursor.fetchall.return_value = []
+        mock_connection = MagicMock()
+        mock_connection.execute.return_value = mock_cursor
+        mock_db.connect.return_value = mock_connection
+
+        subject = MWLStorage(tmp_dir)
+        mock_connection.reset_mock()
+
+        subject.find_worklist_items(scheduled_date="20240101 -")
+
+        mock_connection.execute.assert_called_once_with(
+            (
+                "SELECT accession_number, modality, patient_birth_date, patient_id, "
+                "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
+                "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
+                "FROM worklist_items WHERE scheduled_date >= ? "
+                "ORDER BY scheduled_date, scheduled_time"
+            ),
+            ["20240101"],
+        )
+
+        mock_connection.reset_mock()
+
+        subject.find_worklist_items(scheduled_date="-20240101")
+
+        mock_connection.execute.assert_called_once_with(
+            (
+                "SELECT accession_number, modality, patient_birth_date, patient_id, "
+                "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
+                "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
+                "FROM worklist_items WHERE scheduled_date <= ? "
+                "ORDER BY scheduled_date, scheduled_time"
+            ),
+            ["20240101"],
+        )
+
     def test_get_worklist_item(self, mock_db, tmp_dir, result):
         mock_cursor = MagicMock()
         mock_cursor.fetchone.return_value = result