Merge pull request #952 from megin1989/main

fix: update csv validation file against ig validation #652
tech-by-design · Dec 27, 2024 · 2b08095 · 2b08095
2 parents 29840ab + 0628298
commit 2b08095
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 36 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.403.0</version>
+	<version>0.404.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/validate-nyher-fhir-ig-equivalent.py b/support/specifications/flat-file/validate-nyher-fhir-ig-equivalent.py
@@ -80,19 +80,12 @@ def validate_package(spec_path, file1, file2, file3, file4, output_path):
         package = Package(package_descriptor)
 
         # Transform and validate
-        common_transform_steps = [
-            ("ORGANIZATION_TYPE", "organization_type"),
-            ("ORGANIZATION_TYPE_DISPLAY", "organization_type_display"),
-            ("ORGANIZATION_TYPE_CODE", "organization_type_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"),
+        common_transform_steps = [ 
+            ("ORGANIZATION_TYPE_DISPLAY", "organization_type_display"), 
+            ("FACILITY_STATE", "facility_state"),   
             ("SCREENING_STATUS_CODE", "screening_status_code"),
             ("SCREENING_CODE_DESCRIPTION", "screening_code_description"),
-            ("QUESTION_CODE_TEXT", "question_code_text"),
-            ("UCUM_UNITS", "ucum_units"),
-            ("SDOH_DOMAIN", "sdoh_domain"),
+            ("QUESTION_CODE_TEXT", "question_code_text"),  
             ("ANSWER_CODE", "answer_code"),
             ("ANSWER_CODE_DESCRIPTION", "answer_code_description"),
             ("GENDER", "gender"), 
@@ -101,34 +94,16 @@ def validate_package(spec_path, file1, file2, file3, file4, output_path):
             ("RELATIONSHIP_PERSON_DESCRIPTION", "relationship_person_description"),
             ("STATE", "state"),
             ("EXTENSION_GENDER_IDENTITY_DISPLAY", "extension_gender_identity_display"),            
-            ("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_DESCRIPTION", "sexual_orientation_value_code_description"),
-            ("PREFERRED_LANGUAGE_CODE", "preferred_language_code"),
-            ("PREFERRED_LANGUAGE_CODE_DESCRIPTION", "preferred_language_code_description"),
+            ("GENDER_IDENTITY_CODE", "gender_identity_code"),  
+            ("SEXUAL_ORIENTATION_VALUE_CODE_DESCRIPTION", "sexual_orientation_value_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_DESCRIPTION", "extension_ombcategory_ethnicity_code_description"), 
-            ("SCREENING_LANGUAGE", "screening_language"),
-            ("RESOURCE_CONTENT_LANGUAGE", "resource_content_language"),
-            ("CONSENT_SCOPE_CODE", "consent_scope_code"),
-            ("CONSENT_STATUS", "consent_status"),
-            ("CONSENT_CATEGORY_IDSCL_CODE","consent_category_idscl_code"),
-            ("CONSENT_CATEGORY_LOINC_DISPLAY", "consent_category_loinc_display"),   
-            ("CONSENT_STATUS", "consent_status"), 
-            ("CONSENT_PROVISION_TYPE", "consent_provision_type"), 
-            ("OBSERVATION_CATEGORY_SDOH_CODE",""),
+            ("EXTENSION_OMBCATEGORY_ETHNICITY_CODE_DESCRIPTION", "extension_ombcategory_ethnicity_code_description"),   
+            ("CONSENT_STATUS", "consent_status"),   
             ("OBSERVATION_CATEGORY_SDOH_CODE","observation_category_sdoh_code"),
-            ("OBSERVATION_CATEGORY_SDOH_DISPLAY","observation_category_sdoh_display"),
-            ("OBSERVATION_CATEGORY_SOCIAL_HISTORY_CODE","observation_category_social_history_code"),
-            ("OBSERVATION_CATEGORY_SURVEY_CODE","observation_category_survey_code"),
-            ("QUESTION_CODE_DISPLAY","question_code_display"),
-            ("LANGUAGE", "language"), 
-            ("INTERPRETATION_CODE", "interpretation_code"), 
-            ("INTERPRETATION_DISPLAY", "interpretation_display"),
+            ("OBSERVATION_CATEGORY_SDOH_DISPLAY","observation_category_sdoh_display"),  
+            ("QUESTION_CODE_DISPLAY","question_code_display"),  
             ("DATA_ABSENT_REASON_CODE", "data_absent_reason_code"),
             ("DATA_ABSENT_REASON_DISPLAY", "data_absent_reason_display")
         ]