Skip to content

Commit

Permalink
Single Administrated Medication (#2796)
Browse files Browse the repository at this point in the history
* Use to_array to handle a single administrated medication

* Add tests

* Fix tests
  • Loading branch information
JNygaard-Skylight authored Oct 21, 2024
1 parent a35c892 commit 12d133e
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 2 deletions.
3 changes: 2 additions & 1 deletion containers/fhir-converter/Templates/eCR/Header.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@
{% include 'Resource/CarePlan' carePlan: carePlanResource ID: carePlanId patientReference: fullPatientId %}

{% assign medicationsAdministered = msg | get_first_ccda_sections_by_template_id: '2.16.840.1.113883.10.20.22.2.38' %}
{% for entry in medicationsAdministered.2_16_840_1_113883_10_20_22_2_38.entry %}
{% assign entries = medicationsAdministered.2_16_840_1_113883_10_20_22_2_38.entry | to_array -%}
{% for entry in entries %}
{% assign substanceAdministrationId = entry.substanceAdministration | to_json_string | generate_uuid -%}
{% include 'Resource/MedicationAdministration', medicationAdministration: entry.substanceAdministration, ID: substanceAdministrationId -%}
{% assign manufacturedMaterialId = entry.substanceAdministration.consumable.manufacturedProduct.manufacturedMaterial | to_json_string | generate_uuid -%}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@
"entry":
[
{% if component.section.templateId.root == "2.16.840.1.113883.10.20.22.2.38" or component.section.templateId[0].root == "2.16.840.1.113883.10.20.22.2.38" %}
{% for entry in component.section.entry %}
{% assign entries = component.section.entry | to_array -%}
{% for entry in entries -%}
{% assign medicationAdministrationId = entry.substanceAdministration | to_json_string | generate_uuid -%}
{% assign fullMedicationAdministrationId = medicationAdministrationId | prepend: 'MedicationAdministration/' -%}
{
Expand Down
48 changes: 48 additions & 0 deletions containers/fhir-converter/tests/integration/test_FHIR-Converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,51 @@ def test_invalid_rr_format(setup):
== "Reportability Response and eICR message both "
"must be valid XML messages."
)


@pytest.mark.integration
def test_single_administrated_medications():
input_data = open(
Path(__file__).parent.parent
/ "test_files/eICR_with_single_administrated_medication.xml"
).read()
request = {"input_data": input_data, "input_type": "ecr", "root_template": "EICR"}
ecr_conversion_response = httpx.post(CONVERT_TO_FHIR, json=request)
assert ecr_conversion_response.status_code == 200

medication_administration = list(
filter(
lambda x: x.get("fullUrl")
== "urn:uuid:620f71f8-1ab2-93c8-e0f5-44aec35c7aba",
ecr_conversion_response.json()["response"]["FhirResource"]["entry"],
)
)
assert len(medication_administration) == 1


@pytest.mark.integration
def test_multiple_administrated_medications():
input_data = open(
Path(__file__).parent.parent
/ "test_files/eICR_with_multiple_administrated_medication.xml"
).read()
request = {"input_data": input_data, "input_type": "ecr", "root_template": "EICR"}
ecr_conversion_response = httpx.post(CONVERT_TO_FHIR, json=request)
assert ecr_conversion_response.status_code == 200

medication_administration_references = [
x["fullUrl"]
for x in filter(
lambda x: x["resource"]["resourceType"] == "MedicationAdministration",
ecr_conversion_response.json()["response"]["FhirResource"]["entry"],
)
]
assert len(medication_administration_references) == 2
assert (
"urn:uuid:04081e41-bac1-0680-4f49-e56a052a76ed"
in medication_administration_references
)
assert (
"urn:uuid:44220e5f-c8ce-8841-056d-ed4c52e12520"
in medication_administration_references
)

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 12d133e

Please sign in to comment.