diff --git a/.gitignore b/.gitignore index f4fbcc9..45aa949 100644 --- a/.gitignore +++ b/.gitignore @@ -549,3 +549,6 @@ dmypy.json # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode **/__pycache__/** + +# MacOS generated files +.DS_STORE diff --git a/src/dcm_classifier/utility_functions.py b/src/dcm_classifier/utility_functions.py index 81d5cbc..ec6c058 100644 --- a/src/dcm_classifier/utility_functions.py +++ b/src/dcm_classifier/utility_functions.py @@ -766,7 +766,15 @@ def get_coded_dictionary_elements( else: dataset_dictionary[feature] = 0 elif name == "ContrastBolusAgent": - no_contrast_list = ["none", "no", "no contrast", "no_contrast", "n", ""] + no_contrast_list = [ + "none", + "no", + "no contrast", + "no_contrast", + "n", + "", + "-12345", + ] if str(value).lower() in no_contrast_list: dataset_dictionary["ContrastBolusAgent"] = "None" else: diff --git a/tests/testing_data/anonymized_testing_data/contrast_data/without_contrast/no_contrastbolusagent_tag.dcm b/tests/testing_data/anonymized_testing_data/contrast_data/without_contrast/no_contrastbolusagent_tag.dcm new file mode 100644 index 0000000..0f4c7fa --- /dev/null +++ b/tests/testing_data/anonymized_testing_data/contrast_data/without_contrast/no_contrastbolusagent_tag.dcm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d710631c61e7953e600b37d02ba3009ebe5b28f51b866cb7c29cca8e23a1468 +size 132604 diff --git a/tests/testing_data/integration_testing/classify_study_data/output.json b/tests/testing_data/integration_testing/classify_study_data/output.json index b180d2d..e42308d 100644 --- a/tests/testing_data/integration_testing/classify_study_data/output.json +++ b/tests/testing_data/integration_testing/classify_study_data/output.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0e3d723c3bd7976e68491d0674bdefffde8a378bb0cf49fbea01bf63bb22e89 -size 33747 +oid sha256:eac37171712b3b71e90a9f200e24f84f735ea9d50b48691a897d14b030c32e38 +size 32941 diff --git a/tests/unit_testing/test_dicom_series.py b/tests/unit_testing/test_dicom_series.py index 6d5b179..129f417 100644 --- a/tests/unit_testing/test_dicom_series.py +++ b/tests/unit_testing/test_dicom_series.py @@ -205,7 +205,9 @@ def test_dcm_series_no_contrast(no_contrast_file_path): study.run_inference() for series_number, series in study.series_dictionary.items(): - assert series.get_has_contrast() is False + assert ( + series.get_has_contrast() is False + ), f"File {series.get_volume_list()[0].get_one_volume_dcm_filenames()[0].name} came back with contrast" def test_dcm_series_has_contrast(contrast_file_path):