From 9b38378398ce745ccb517c57742d49630663edc4 Mon Sep 17 00:00:00 2001 From: James Wharmby Date: Mon, 13 Oct 2025 15:14:03 +0100 Subject: [PATCH 1/3] fixed --- recordprocessor/src/utils_for_fhir_conversion.py | 4 ++-- recordprocessor/tests/test_utils_for_fhir_conversion.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recordprocessor/src/utils_for_fhir_conversion.py b/recordprocessor/src/utils_for_fhir_conversion.py index 8e91ed63a5..951c25198f 100644 --- a/recordprocessor/src/utils_for_fhir_conversion.py +++ b/recordprocessor/src/utils_for_fhir_conversion.py @@ -68,9 +68,9 @@ def date(date: str) -> str: @staticmethod def gender_code(code: any) -> any: - """Converts gender code to fhir gender if the code is recognised. Otherwise returns the original code.""" + """Converts gender code to fhir gender if the code is recognised. Otherwise returns 'invalid'.""" code_to_fhir = {"1": "male", "2": "female", "9": "other", "0": "unknown"} - return code_to_fhir.get(code, code) + return code_to_fhir.get(code, 'invalid') @staticmethod def boolean(value: any) -> any: diff --git a/recordprocessor/tests/test_utils_for_fhir_conversion.py b/recordprocessor/tests/test_utils_for_fhir_conversion.py index 7b77b2ad56..3df17a1ef6 100644 --- a/recordprocessor/tests/test_utils_for_fhir_conversion.py +++ b/recordprocessor/tests/test_utils_for_fhir_conversion.py @@ -88,8 +88,8 @@ def test_convert_gender_code(self): self.assertEqual(Convert.gender_code(code), expected) # Invalid gender codes - for value in [1, "invalid", None]: - self.assertEqual(Convert.gender_code(value), value) + for value in [1, "3", "1290", "invalid", None]: + self.assertEqual(Convert.gender_code(value), "invalid") def test_convert_boolean(self): """ From 1e5543c7ae13622508f0bfee416a82fe9161dc22 Mon Sep 17 00:00:00 2001 From: James Wharmby Date: Mon, 13 Oct 2025 15:23:09 +0100 Subject: [PATCH 2/3] fixed II --- recordprocessor/src/utils_for_fhir_conversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recordprocessor/src/utils_for_fhir_conversion.py b/recordprocessor/src/utils_for_fhir_conversion.py index 951c25198f..ebc44a57d6 100644 --- a/recordprocessor/src/utils_for_fhir_conversion.py +++ b/recordprocessor/src/utils_for_fhir_conversion.py @@ -70,7 +70,7 @@ def date(date: str) -> str: def gender_code(code: any) -> any: """Converts gender code to fhir gender if the code is recognised. Otherwise returns 'invalid'.""" code_to_fhir = {"1": "male", "2": "female", "9": "other", "0": "unknown"} - return code_to_fhir.get(code, 'invalid') + return code_to_fhir.get(code, "invalid") @staticmethod def boolean(value: any) -> any: From 5ba5fb889f65ddd76c899250c32651d2361f892e Mon Sep 17 00:00:00 2001 From: James Wharmby Date: Mon, 13 Oct 2025 17:18:30 +0100 Subject: [PATCH 3/3] test for "male" --- recordprocessor/tests/test_utils_for_fhir_conversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recordprocessor/tests/test_utils_for_fhir_conversion.py b/recordprocessor/tests/test_utils_for_fhir_conversion.py index 3df17a1ef6..01efd42a9d 100644 --- a/recordprocessor/tests/test_utils_for_fhir_conversion.py +++ b/recordprocessor/tests/test_utils_for_fhir_conversion.py @@ -88,7 +88,7 @@ def test_convert_gender_code(self): self.assertEqual(Convert.gender_code(code), expected) # Invalid gender codes - for value in [1, "3", "1290", "invalid", None]: + for value in [1, "3", "1290", "male", "invalid", None]: self.assertEqual(Convert.gender_code(value), "invalid") def test_convert_boolean(self):