Merge pull request #950 from megin1989/main

fix: resolve IG validation errors in CSV validation and update documentation #652
tech-by-design · Dec 27, 2024 · 32a6a19 · 32a6a19
2 parents 03d9d8d + 03d11eb
commit 32a6a19
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/hub-prime/pom.xml b/hub-prime/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.techbd</groupId>
 	<artifactId>hub-prime</artifactId>
-	<version>0.401.0</version>
+	<version>0.402.0</version>
 	<packaging>war</packaging>
 	<name>Tech by Design Hub (Prime)</name>
 	<description>Tech by Design Hub (Primary)</description>

diff --git a/support/specifications/flat-file/datapackage-nyher-fhir-ig-equivalent.json b/support/specifications/flat-file/datapackage-nyher-fhir-ig-equivalent.json
@@ -52,7 +52,7 @@
         {"name": "PATIENT_MR_ID_VALUE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Patient').identifier.where(type.coding.code = 'MR').value", "constraints": {"required": true}},
         {"name": "ENCOUNTER_ID", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').id", "constraints": {"required": true}},
         {"name": "ENCOUNTER_CLASS_CODE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').class.code", "constraints": {"required": true, "enum": [
-          "amb", "emer", "fld", "hh", "imp", "acute", "nonac", "obsenc", "prenc", "ss", "vr"
+          "AMB", "EMER", "FLD", "HH", "IMP", "ACUTE", "NONAC", "OBSENC", "PRENC", "SS", "VR"
         ]
       }},
       {"name": "ENCOUNTER_STATUS_CODE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').status", "constraints": {"required": true, "enum": [
@@ -337,7 +337,7 @@
             ]}},
           {"name": "ZIP", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Patient').address.postalCode", "constraints": { "pattern": "^\\d{5}(\\d{4})?$"}},
           {"name": "TELECOM_VALUE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Patient').telecom.value", "constraints": { "required": true}},         
-          {"name": "EXTENSION_PERSONAL_PRONOUNS_CODE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://shinny.org/us/ny/hrsn/StructureDefinition/shinny-personal-pronouns').valueCodeableConcept.coding.code", "constraints": {"enum":[ "LA29518-0", "LA29519-8", "LA29520-6", "oth", "unk"]}},
+          {"name": "EXTENSION_PERSONAL_PRONOUNS_CODE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://shinny.org/us/ny/hrsn/StructureDefinition/shinny-personal-pronouns').valueCodeableConcept.coding.code", "constraints": {"enum":[ "LA29518-0", "LA29519-8", "LA29520-6", "OTH", "UNK"]}},
           {"name": "EXTENSION_PERSONAL_PRONOUNS_DISPLAY", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://shinny.org/us/ny/hrsn/StructureDefinition/shinny-personal-pronouns').valueCodeableConcept.coding.display", "constraints": {"enum": [
             "he/him/his/his/himself",
             "she/her/her/hers/herself",
@@ -353,8 +353,8 @@
               "446131000124102",
               "446141000124107",
               "446151000124109",
-              "oth",
-              "unk",
+              "OTH",
+              "UNK",
               "asked-declined"
             ]}},
           {"name": "EXTENSION_GENDER_IDENTITY_DISPLAY", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://terminology.hl7.org/CodeSystem/v3-NullFlavor').valueCodeableConcept.coding.display", "constraints": {  
@@ -538,7 +538,7 @@
             "urn:oid:2.16.840.1.113883.6.238", 
             "http://terminology.hl7.org/CodeSystem/v3-NullFlavor" 
           ]}},           
-          {"name": "EXTENSION_OMBCATEGORY_ETHNICITY_CODE", "type": "string", "description": "Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity').extension.where(url = 'ombCategory').valueCoding.code", "constraints": { "enum":["2135-2", "2186-5", "2133-7", "asku", "unk", "oth"]}},
+          {"name": "EXTENSION_OMBCATEGORY_ETHNICITY_CODE", "type": "string", "description": "Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity').extension.where(url = 'ombCategory').valueCoding.code", "constraints": { "enum":["2135-2", "2186-5", "2133-7", "ASKU", "UNK", "OTH"]}},
           {"name": "EXTENSION_OMBCATEGORY_ETHNICITY_CODE_DESCRIPTION", "type": "string", "description": "Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity').extension.where(url = 'ombCategory').valueCoding.display", "constraints": { "enum":["hispanic or latino", "non hispanic or latino", "asked but unknown", "unknown", "other", "ethnicity"]}},
           {"name": "EXTENSION_OMBCATEGORY_ETHNICITY_CODE_SYSTEM_NAME", "type": "string", "description": "Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity').extension.where(url = 'ombCategory').valueCoding.system", "constraints": { "enum":[
             "urn:oid:2.16.840.1.113883.6.238" , "http://terminology.hl7.org/CodeSystem/v3-NullFlavor"
@@ -565,8 +565,8 @@
             "38628009",
             "42035005",
             "765288000",
-            "oth",
-            "unk",
+            "OTH",
+            "UNK",
             "asked-declined"
           ]}},
           {"name": "SEXUAL_ORIENTATION_VALUE_CODE_DESCRIPTION", "type": "string", "description":"Bundle.entry.resource.where(resourceType = 'Observation').where(meta.profile = 'http://shinny.org/us/ny/hrsn/StructureDefinition/shin-ny-observation-sexual-orientation').valueCodeableConcept.coding.display", "constraints": {  "enum":[

diff --git a/support/specifications/flat-file/documentation.auto.md b/support/specifications/flat-file/documentation.auto.md
@@ -89,7 +89,7 @@
   - `type` string
   - `constraints`:
     - `required` True
-    - `enum` ['amb', 'emer', 'fld', 'hh', 'imp', 'acute', 'nonac', 'obsenc', 'prenc', 'ss', 'vr']
+    - `enum` ['AMB', 'EMER', 'FLD', 'HH', 'IMP', 'ACUTE', 'NONAC', 'OBSENC', 'PRENC', 'SS', 'VR']
 ### `ENCOUNTER_STATUS_CODE`
   - `description` Bundle.entry.resource.where(resourceType ='Encounter').status
   - `type` string
@@ -343,7 +343,7 @@
   - `description` Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://shinny.org/us/ny/hrsn/StructureDefinition/shinny-personal-pronouns').valueCodeableConcept.coding.code
   - `type` string
   - `constraints`:
-    - `enum` ['LA29518-0', 'LA29519-8', 'LA29520-6', 'oth', 'unk']
+    - `enum` ['LA29518-0', 'LA29519-8', 'LA29520-6', 'OTH', 'UNK']
 ### `EXTENSION_PERSONAL_PRONOUNS_DISPLAY`
   - `description` Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://shinny.org/us/ny/hrsn/StructureDefinition/shinny-personal-pronouns').valueCodeableConcept.coding.display
   - `type` string
@@ -358,7 +358,7 @@
   - `description` Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://terminology.hl7.org/CodeSystem/v3-NullFlavor').valueCodeableConcept.coding.code
   - `type` string
   - `constraints`:
-    - `enum` ['33791000087105', '407376001', '407377005', '446131000124102', '446141000124107', '446151000124109', 'oth', 'unk', 'asked-declined']
+    - `enum` ['33791000087105', '407376001', '407377005', '446131000124102', '446141000124107', '446151000124109', 'OTH', 'UNK', 'asked-declined']
 ### `EXTENSION_GENDER_IDENTITY_DISPLAY`
   - `description` Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://terminology.hl7.org/CodeSystem/v3-NullFlavor').valueCodeableConcept.coding.display
   - `type` string
@@ -400,7 +400,7 @@
   - `description` Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity').extension.where(url = 'ombCategory').valueCoding.code
   - `type` string
   - `constraints`:
-    - `enum` ['2135-2', '2186-5', '2133-7', 'asku', 'unk', 'oth']
+    - `enum` ['2135-2', '2186-5', '2133-7', 'ASKU', 'UNK', 'OTH']
 ### `EXTENSION_OMBCATEGORY_ETHNICITY_CODE_DESCRIPTION`
   - `description` Bundle.entry.resource.where(resourceType ='Patient').extension.where(url='http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity').extension.where(url = 'ombCategory').valueCoding.display
   - `type` string
@@ -440,7 +440,7 @@
   - `description` Bundle.entry.resource.where(resourceType = 'Observation').where(meta.profile = 'http://shinny.org/us/ny/hrsn/StructureDefinition/shin-ny-observation-sexual-orientation').valueCodeableConcept.coding.code
   - `type` string
   - `constraints`:
-    - `enum` ['20430005', '38628009', '42035005', '765288000', 'oth', 'unk', 'asked-declined']
+    - `enum` ['20430005', '38628009', '42035005', '765288000', 'OTH', 'UNK', 'asked-declined']
 ### `SEXUAL_ORIENTATION_VALUE_CODE_DESCRIPTION`
   - `description` Bundle.entry.resource.where(resourceType = 'Observation').where(meta.profile = 'http://shinny.org/us/ny/hrsn/StructureDefinition/shin-ny-observation-sexual-orientation').valueCodeableConcept.coding.display
   - `type` string

diff --git a/support/specifications/flat-file/validate-nyher-fhir-ig-equivalent.py b/support/specifications/flat-file/validate-nyher-fhir-ig-equivalent.py
@@ -84,8 +84,7 @@ def validate_package(spec_path, file1, file2, file3, file4, output_path):
             ("ORGANIZATION_TYPE", "organization_type"),
             ("ORGANIZATION_TYPE_DISPLAY", "organization_type_display"),
             ("ORGANIZATION_TYPE_CODE", "organization_type_code"),
-            ("FACILITY_STATE", "facility_state"),
-            ("ENCOUNTER_CLASS_CODE", "encounter_class_code"),
+            ("FACILITY_STATE", "facility_state"), 
             ("ENCOUNTER_CLASS_CODE_DESCRIPTION", "encounter_class_code_description"),
             ("ENCOUNTER_STATUS_CODE", "encounter_status_code"), 
             ("ENCOUNTER_TYPE_CODE_DESCRIPTION", "encounter_type_code_description"),
@@ -105,15 +104,13 @@ def validate_package(spec_path, file1, file2, file3, file4, output_path):
             ("GENDER_IDENTITY_CODE", "gender_identity_code"),
             ("GENDER_IDENTITY_CODE_DESCRIPTION", "gender_identity_code_description"),
             ("GENDER_IDENTITY_CODE_SYSTEM_NAME", "gender_identity_code_system_name"),
-            ("SEXUAL_ORIENTATION_TEXT_STATUS", "sexual_orientation_text_status"),
-            ("SEXUAL_ORIENTATION_VALUE_CODE", "sexual_orientation_value_code"),
+            ("SEXUAL_ORIENTATION_TEXT_STATUS", "sexual_orientation_text_status"), 
             ("SEXUAL_ORIENTATION_VALUE_CODE_DESCRIPTION", "sexual_orientation_value_code_description"),
             ("PREFERRED_LANGUAGE_CODE", "preferred_language_code"),
             ("PREFERRED_LANGUAGE_CODE_DESCRIPTION", "preferred_language_code_description"),
             ("PREFERRED_LANGUAGE_CODE_SYSTEM_NAME", "preferred_language_code_system_name"), 
             ("EXTENSION_OMBCATEGORY_RACE_CODE", "extension_ombcategory_race_code"),
-            ("EXTENSION_OMBCATEGORY_RACE_CODE_DESCRIPTION", "extension_ombcategory_race_code_description"), 
-            ("EXTENSION_OMBCATEGORY_ETHNICITY_CODE", "extension_ombcategory_ethnicity_code"), 
+            ("EXTENSION_OMBCATEGORY_RACE_CODE_DESCRIPTION", "extension_ombcategory_race_code_description"),  
             ("EXTENSION_OMBCATEGORY_ETHNICITY_CODE_DESCRIPTION", "extension_ombcategory_ethnicity_code_description"), 
             ("SCREENING_LANGUAGE", "screening_language"),
             ("RESOURCE_CONTENT_LANGUAGE", "resource_content_language"),