Revert "Check for RR field presence before merging RR to eCR" (#868)

Revert "Check for RR field presence before merging RR to eCR (#866)"

This reverts commit 8a090df.

phdi/fhir/conversion/convert.py

@@ -48,10 +48,6 @@ def add_rr_data_to_eicr(rr, ecr):
     rr = etree.fromstring(rr)
     ecr = etree.fromstring(ecr)
 
-    if ecr.xpath('//*[@codeSystem="2.16.840.1.113883.6.1"]'):
-        print("This eCR has already been merged with RR data.")
-        return etree.tostring(ecr, encoding="unicode", method="xml")
-
     # Create the tags for elements we'll be looking for
     rr_tags = [
         "templateId",

tests/fhir/conversion/test_conversion.py

@@ -335,30 +335,3 @@ def test_add_rr_to_ecr():
             assert temps is not None
             assert temps.attrib["root"] == "2.16.840.1.113883.10.20.15.2.3.29"
             assert "RRVS19" in status_code.attrib["code"]
-
-
-def test_add_rr_to_ecr_rr_already_present(capfd):
-    with open(
-        pathlib.Path(__file__).parent.parent.parent
-        / "assets"
-        / "fhir-converter"
-        / "rr_extraction"
-        / "CDA_RR.xml"
-    ) as fp:
-        rr = fp.read()
-
-    # This eICR has already been merged with an RR
-    with open(
-        pathlib.Path(__file__).parent.parent.parent
-        / "assets"
-        / "fhir-converter"
-        / "rr_extraction"
-        / "merged_eICR.xml"
-    ) as fp:
-        ecr = fp.read()
-
-    merged_ecr = add_rr_data_to_eicr(rr, ecr)
-    assert merged_ecr == ecr
-
-    out, err = capfd.readouterr()
-    assert "This eCR has already been merged with RR data." in out