fix: Some low hanging fruit (#63)

* fix coding system and profile names

* hard code coding

* remove junk

* update expected number of validation errors

Author: JNygaard-Skylight

data/Templates/eCR/Resource/_ObservationExposureContact.liquid

@@ -30,7 +30,7 @@
             {
                 "coding": [
                     {
-                        "system": "http://terminology.hl7.org/ValueSet/v3-ActClassExposure",
+                        "system": "http://terminology.hl7.org/CodeSystem/v3-ActClass",
                         "code": "EXPOS",
                     }
                 ]

data/Templates/eCR/Resource/_ObservationPostpartumStatus.liquid

@@ -7,7 +7,7 @@
         {
             "profile":
             [
-                "http://hl7.org/fhir/us/ecr/2.1.2/StructureDefinition-us-ph-postpartum-status",
+                "http://hl7.org/fhir/us/ecr/StructureDefinition/us-ph-postpartum-status",
             ],
         },
         "identifier":

data/Templates/eCR/Resource/_ObservationRREICRProcessingStatusReason.liquid

@@ -23,8 +23,12 @@
         {
             "coding":
             [
-                { {% include 'DataType/Coding' Coding: ob.code -%} },
-            ]
+                {
+                    "code": "RR6",
+                    "system": "urn:oid:2.16.840.1.114222.4.5.232",
+                    "display": "eICR Processing Status Reason"
+                },
+            ],
         },
         "valueCodeableConcept": {
             {% include 'DataType/CodeableConcept' CodeableConcept: ob.value -%}

src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/BaseConvertDataFunctionalTests.cs

@@ -240,10 +240,10 @@ public static IEnumerable<object[]> GetDataForEcr()
                 //   5. The number of expected failures at the step in (4)
                 // ]
                 new[] { @"EICR", @"eCR_full.xml", @"eCR_full-expected.json", "validation", "13" },
-                new[] { @"EICR", @"eCR_RR_combined_3_1.xml", @"eCR_RR_combined_3_1-expected.json", "validation", "27" },
-                new[] { @"EICR", @"eCR_EveEverywoman.xml", @"eCR_EveEverywoman-expected.json", "validation", "62" },
+                new[] { @"EICR", @"eCR_RR_combined_3_1.xml", @"eCR_RR_combined_3_1-expected.json", "validation", "26" },
+                new[] { @"EICR", @"eCR_EveEverywoman.xml", @"eCR_EveEverywoman-expected.json", "validation", "58" },
                 new[] { @"EICR", @"eicr04152020.xml", @"eicr04152020-expected.json", "validation", "22" },
-                new[] { @"EICR", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE.xml", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE-expected.json", "validation", "33" },
+                new[] { @"EICR", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE.xml", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE-expected.json", "validation", "32" },
             };
             return data.Select(item => new[]
             {

src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/CDAR2_IG_PHCASERPT_R2_D2_SAMPLE-expected.json

@@ -1208,7 +1208,7 @@
         "id": "4e7f8ad6-3b2a-91e0-0d2a-42f0b0d5719d",
         "meta": {
           "profile": [
-            "http://hl7.org/fhir/us/ecr/2.1.2/StructureDefinition-us-ph-postpartum-status"
+            "http://hl7.org/fhir/us/ecr/StructureDefinition/us-ph-postpartum-status"
           ]
         },
         "identifier": [

src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_EveEverywoman-expected.json

@@ -1852,7 +1852,7 @@
         "id": "94fe2533-e208-a1b4-c510-c9ece8a2d490",
         "meta": {
           "profile": [
-            "http://hl7.org/fhir/us/ecr/2.1.2/StructureDefinition-us-ph-postpartum-status"
+            "http://hl7.org/fhir/us/ecr/StructureDefinition/us-ph-postpartum-status"
           ]
         },
         "identifier": [
@@ -2470,7 +2470,7 @@
           {
             "coding": [
               {
-                "system": "http://terminology.hl7.org/ValueSet/v3-ActClassExposure",
+                "system": "http://terminology.hl7.org/CodeSystem/v3-ActClass",
                 "code": "EXPOS"
               }
             ]
@@ -2539,7 +2539,7 @@
           {
             "coding": [
               {
-                "system": "http://terminology.hl7.org/ValueSet/v3-ActClassExposure",
+                "system": "http://terminology.hl7.org/CodeSystem/v3-ActClass",
                 "code": "EXPOS"
               }
             ]
@@ -2624,7 +2624,7 @@
           {
             "coding": [
               {
-                "system": "http://terminology.hl7.org/ValueSet/v3-ActClassExposure",
+                "system": "http://terminology.hl7.org/CodeSystem/v3-ActClass",
                 "code": "EXPOS"
               }
             ]

src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_RR_combined_3_1-expected.json

@@ -969,7 +969,7 @@
             {
               "code": "RR6",
               "system": "urn:oid:2.16.840.1.114222.4.5.232",
-              "display": "eICR processing status reason"
+              "display": "eICR Processing Status Reason"
             }
           ]
         },