Skip to content

Commit 85d4c2a

Browse files
committed
Simplify C-FIND query parameter extraction
1 parent afbd7b9 commit 85d4c2a

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

src/services/mwl/c_find.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
3838

3939
logger.info(f"C-FIND request from {requestor_aet}")
4040

41-
query_modality = self._get_query_value(identifier, "ScheduledProcedureStepSequence", "Modality")
42-
query_date = self._get_query_value(
43-
identifier, "ScheduledProcedureStepSequence", "ScheduledProcedureStepStartDate"
44-
)
45-
query_patient_id = identifier.get("PatientID", "")
41+
query_patient_id = identifier.get("PatientID")
42+
43+
procedure_sequence = identifier.get("ScheduledProcedureStepSequence", [{}])
44+
query_modality = procedure_sequence[0].get("Modality")
45+
query_date = procedure_sequence[0].get("ScheduledProcedureStepStartDate")
4646

4747
logger.debug(f"Query parameters: modality={query_modality}, date={query_date}, patient_id={query_patient_id}")
4848

@@ -66,15 +66,6 @@ def call(self, event: evt.Event) -> Iterator[Tuple[int, Dataset | None]]:
6666
logger.error(f"Error processing C-FIND request: {e}", exc_info=True)
6767
yield FAILURE, None
6868

69-
def _get_query_value(self, ds: Dataset, sequence_tag: str, item_tag: str) -> str:
70-
try:
71-
sequence = ds.get(sequence_tag, [])
72-
if sequence and len(sequence) > 0:
73-
return str(sequence[0].get(item_tag, ""))
74-
except AttributeError, IndexError:
75-
pass
76-
return ""
77-
7869
def _build_worklist_response(self, item: WorklistItem) -> Dataset:
7970
ds = Dataset()
8071
sps_item = Dataset()

0 commit comments

Comments
 (0)