fix: Remove extension for Reason for Visit section (#94)

angelathe · web-flow · commit e5e154814637 · 2025-09-30T09:51:46.000-07:00
* rm reason for visit extension in composition

* update snapshot tests for fhir converter api

* update snapshot tests and validation num expected errors
diff --git a/data/Templates/eCR/Resource/_Composition.liquid b/data/Templates/eCR/Resource/_Composition.liquid
@@ -88,42 +88,6 @@
                         {% include 'DataType/CodeableConcept' CodeableConcept: component.section.code -%}
                     },
                     "mode":"snapshot",
-                    {% if component.section.templateId.root and component.section.templateId.root == "2.16.840.1.113883.10.20.22.2.12" -%}
-                        {%  assign tds = component.section | concatenate_tds -%}
-                        {% if component.section.text and component.section.text._ and component.section.text._ != null -%}
-                            "extension":
-                            [
-                                {
-                                    "url" : "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                                    "valueString" : "{{ component.section.text._ }}"
-                                },
-                            ],
-                        {% elsif component.section.text and component.section.text.content and component.section.text.content._ != null -%}
-                            "extension":
-                            [
-                                {
-                                    "url" : "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                                    "valueString" : "{{ component.section.text.content._ }}"
-                                },
-                            ],
-                        {% elsif component.section.text and component.section.text.paragraph._ and component.section.text.paragraph._ != null -%}
-                            "extension":
-                            [
-                                {
-                                    "url" : "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                                    "valueString" : "{{ component.section.text.paragraph._ }}"
-                                },
-                            ],
-                        {% elsif tds and tds != '' -%}
-                            "extension":
-                            [
-                                {
-                                    "url" : "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                                    "valueString" : "{{ tds }}"
-                                },
-                            ],
-                        {% endif -%}
-                    {% endif -%}
                     "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" or component.section.templateId[0].root == "2.16.840.1.113883.10.20.22.2.44" %}
diff --git a/src/Dibbs.FhirConverterApi.FunctionalTests/__snapshots__/FhirConverterApiFunctionalTests.ConvertToFhir_ReturnsSuccess_WhenValidEicrWithRrProvided.snap b/src/Dibbs.FhirConverterApi.FunctionalTests/__snapshots__/FhirConverterApiFunctionalTests.ConvertToFhir_ReturnsSuccess_WhenValidEicrWithRrProvided.snap
@@ -180,13 +180,7 @@
                     }
                   ]
                 },
-                "mode": "snapshot",
-                "extension": [
-                  {
-                    "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                    "valueString": "No information"
-                  }
-                ]
+                "mode": "snapshot"
               },
               {
                 "id": "4f5e5135-21ef-80b6-9565-7c8879002754",
diff --git a/src/Dibbs.FhirConverterApi.FunctionalTests/__snapshots__/FhirConverterApiFunctionalTests.ConvertToFhir_ReturnsSuccess_WhenValidEicrWithoutRrProvided.snap b/src/Dibbs.FhirConverterApi.FunctionalTests/__snapshots__/FhirConverterApiFunctionalTests.ConvertToFhir_ReturnsSuccess_WhenValidEicrWithoutRrProvided.snap
@@ -180,13 +180,7 @@
                     }
                   ]
                 },
-                "mode": "snapshot",
-                "extension": [
-                  {
-                    "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                    "valueString": "No information"
-                  }
-                ]
+                "mode": "snapshot"
               },
               {
                 "id": "4f5e5135-21ef-80b6-9565-7c8879002754",
diff --git a/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/BaseConvertDataFunctionalTests.cs b/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/BaseConvertDataFunctionalTests.cs
@@ -239,11 +239,11 @@ public static IEnumerable<object[]> GetDataForEcr()
                 //   4. whether the file should fail at parsing or validation when testing if valid (if it is fully valid, "validation" is what should be there)
                 //   5. The number of expected failures at the step in (4)
                 // ]
-                new[] { @"EICR", @"eCR_full.xml", @"eCR_full-expected.json", "validation", "9" },
-                new[] { @"EICR", @"eCR_RR_combined_3_1.xml", @"eCR_RR_combined_3_1-expected.json", "validation", "13" },
-                new[] { @"EICR", @"eCR_EveEverywoman.xml", @"eCR_EveEverywoman-expected.json", "validation", "37" },
-                new[] { @"EICR", @"eicr04152020.xml", @"eicr04152020-expected.json", "validation", "19" },
-                new[] { @"EICR", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE.xml", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE-expected.json", "validation", "21" },
+                new[] { @"EICR", @"eCR_full.xml", @"eCR_full-expected.json", "validation", "8" },
+                new[] { @"EICR", @"eCR_RR_combined_3_1.xml", @"eCR_RR_combined_3_1-expected.json", "validation", "12" },
+                new[] { @"EICR", @"eCR_EveEverywoman.xml", @"eCR_EveEverywoman-expected.json", "validation", "36" },
+                new[] { @"EICR", @"eicr04152020.xml", @"eicr04152020-expected.json", "validation", "17" },
+                new[] { @"EICR", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE.xml", @"CDAR2_IG_PHCASERPT_R2_D2_SAMPLE-expected.json", "validation", "20" },
             };
             return data.Select(item => new[]
             {
diff --git a/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/CDAR2_IG_PHCASERPT_R2_D2_SAMPLE-expected.json b/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/CDAR2_IG_PHCASERPT_R2_D2_SAMPLE-expected.json
@@ -189,13 +189,7 @@
                 }
               ]
             },
-            "mode": "snapshot",
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                "valueString": "Dark stools"
-              }
-            ]
+            "mode": "snapshot"
           },
           {
             "id": "d887e17f-f7d9-15f6-24e0-73c549af07d6",
diff --git a/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_EveEverywoman-expected.json b/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_EveEverywoman-expected.json
@@ -212,13 +212,7 @@
                 }
               ]
             },
-            "mode": "snapshot",
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                "valueString": "Reason for Visit (as documented by provider): Headache, rash, and                            fever"
-              }
-            ]
+            "mode": "snapshot"
           },
           {
             "id": "f1cd3d12-56aa-80b7-f5df-4b4e2e11c689",
diff --git a/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_RR_combined_3_1-expected.json b/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_RR_combined_3_1-expected.json
@@ -348,13 +348,7 @@
                 }
               ]
             },
-            "mode": "snapshot",
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                "valueString": "REMOVED"
-              }
-            ]
+            "mode": "snapshot"
           },
           {
             "id": "36C1EC28-DA66-11EF-B655-005056BE2511",
diff --git a/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_full-expected.json b/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eCR_full-expected.json
@@ -159,13 +159,7 @@
                 }
               ]
             },
-            "mode": "snapshot",
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                "valueString": "recent travel for vacation to Wuhan China from April 22, 2020 to                            May 5, 2020 "
-              }
-            ]
+            "mode": "snapshot"
           },
           {
             "id": "59bb13bd-ad44-eedb-b5a7-8c0e56eff9df",
diff --git a/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eicr04152020-expected.json b/src/Microsoft.Health.Fhir.Liquid.Converter.FunctionalTests/TestData/Expected/eCR/EICR/eicr04152020-expected.json
@@ -99,13 +99,7 @@
                 }
               ]
             },
-            "mode": "snapshot",
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",
-                "valueString": "No Information Available"
-              }
-            ]
+            "mode": "snapshot"
           },
           {
             "id": "52ef27c7-0c59-eae8-5c4c-4912a793d7e0",

Original file line number	Diff line number	Diff line change
`@@ -180,13 +180,7 @@`
`180`	`180`	`}`
`181`	`181`	`]`
`182`	`182`	`},`
`183`		`- "mode": "snapshot",`
`184`		`- "extension": [`
`185`		`- {`
`186`		`- "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",`
`187`		`- "valueString": "No information"`
`188`		`- }`
`189`		`- ]`
	`183`	`+ "mode": "snapshot"`
`190`	`184`	`},`
`191`	`185`	`{`
`192`	`186`	`"id": "4f5e5135-21ef-80b6-9565-7c8879002754",`
Original file line number	Diff line number	Diff line change
`@@ -189,13 +189,7 @@`
`189`	`189`	`}`
`190`	`190`	`]`
`191`	`191`	`},`
`192`		`- "mode": "snapshot",`
`193`		`- "extension": [`
`194`		`- {`
`195`		`- "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",`
`196`		`- "valueString": "Dark stools"`
`197`		`- }`
`198`		`- ]`
	`192`	`+ "mode": "snapshot"`
`199`	`193`	`},`
`200`	`194`	`{`
`201`	`195`	`"id": "d887e17f-f7d9-15f6-24e0-73c549af07d6",`
Original file line number	Diff line number	Diff line change
`@@ -212,13 +212,7 @@`
`212`	`212`	`}`
`213`	`213`	`]`
`214`	`214`	`},`
`215`		`- "mode": "snapshot",`
`216`		`- "extension": [`
`217`		`- {`
`218`		`- "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",`
`219`		`- "valueString": "Reason for Visit (as documented by provider): Headache, rash, and fever"`
`220`		`- }`
`221`		`- ]`
	`215`	`+ "mode": "snapshot"`
`222`	`216`	`},`
`223`	`217`	`{`
`224`	`218`	`"id": "f1cd3d12-56aa-80b7-f5df-4b4e2e11c689",`
Original file line number	Diff line number	Diff line change
`@@ -348,13 +348,7 @@`
`348`	`348`	`}`
`349`	`349`	`]`
`350`	`350`	`},`
`351`		`- "mode": "snapshot",`
`352`		`- "extension": [`
`353`		`- {`
`354`		`- "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",`
`355`		`- "valueString": "REMOVED"`
`356`		`- }`
`357`		`- ]`
	`351`	`+ "mode": "snapshot"`
`358`	`352`	`},`
`359`	`353`	`{`
`360`	`354`	`"id": "36C1EC28-DA66-11EF-B655-005056BE2511",`
Original file line number	Diff line number	Diff line change
`@@ -159,13 +159,7 @@`
`159`	`159`	`}`
`160`	`160`	`]`
`161`	`161`	`},`
`162`		`- "mode": "snapshot",`
`163`		`- "extension": [`
`164`		`- {`
`165`		`- "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",`
`166`		`- "valueString": "recent travel for vacation to Wuhan China from April 22, 2020 to May 5, 2020 "`
`167`		`- }`
`168`		`- ]`
	`162`	`+ "mode": "snapshot"`
`169`	`163`	`},`
`170`	`164`	`{`
`171`	`165`	`"id": "59bb13bd-ad44-eedb-b5a7-8c0e56eff9df",`
Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,7 @@`
`99`	`99`	`}`
`100`	`100`	`]`
`101`	`101`	`},`
`102`		`- "mode": "snapshot",`
`103`		`- "extension": [`
`104`		`- {`
`105`		`- "url": "http://hl7.org/fhir/cda/ccda/StructureDefinition/2.16.840.1.113883.10.20.22.2.12",`
`106`		`- "valueString": "No Information Available"`
`107`		`- }`
`108`		`- ]`
	`102`	`+ "mode": "snapshot"`
`109`	`103`	`},`
`110`	`104`	`{`
`111`	`105`	`"id": "52ef27c7-0c59-eae8-5c4c-4912a793d7e0",`