Merge branch 'main' of https://github.com/alan-francis/1115-hub

alan-francis · Apr 23, 2024 · 682d6cb · 682d6cb
2 parents c6220a1 + f48ed7f
commit 682d6cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/ahc-hrsn-elt/screening/csv.ts b/src/ahc-hrsn-elt/screening/csv.ts
@@ -623,7 +623,7 @@ export class AdminDemographicCsvFileIngestSource<
       -- because assurance CTEs require them
       CREATE TABLE ${tableName} AS
         SELECT *, row_number() OVER () as src_file_row_number, '${sessionID}' as session_id, '${sessionEntryID}' as session_entry_id
-          FROM read_csv_auto('${uri}', types={'SEX_AT_BIRTH_CODE': 'VARCHAR', 'ADMINISTRATIVE_SEX_CODE': 'VARCHAR', 'SEXUAL_ORIENTATION_CODE': 'VARCHAR', 'GENDER_IDENTITY_CODE': 'VARCHAR'});
+          FROM read_csv_auto('${uri}', types={'MPI_ID': 'VARCHAR', 'SEX_AT_BIRTH_CODE': 'VARCHAR', 'ADMINISTRATIVE_SEX_CODE': 'VARCHAR', 'SEXUAL_ORIENTATION_CODE': 'VARCHAR', 'GENDER_IDENTITY_CODE': 'VARCHAR'});
 
       ${ssr.requiredColumnNames()}
 
@@ -708,6 +708,10 @@ export class AdminDemographicCsvFileIngestSource<
       ${adar.onlyAllowValidRaceCodeDescriptionInAllRows("RACE_CODE_DESCRIPTION")}
       ${adar.onlyAllowValidPreferredLanguageCodeInAllRows("PREFERRED_LANGUAGE_CODE")}
       ${adar.onlyAllowValidPreferredLanguageCodeDescriptionInAllRows("PREFERRED_LANGUAGE_DESCRIPTION")}
+      ${tr.onlyAllowedValuesInAllRows(
+        "PREFERRED_LANGUAGE_CODE_SYSTEM_NAME",
+        "'ISO','ISO 639-2','http://hl7.org/fhir/us/core/ValueSet/simple-language'"
+      )}
       ${adar.car.onlyAllowValidFieldCombinationsInAllRows("RACE_CODE","RACE_CODE_DESCRIPTION")}
       ${adar.car.onlyAllowValidFieldCombinationsInAllRows("PREFERRED_LANGUAGE_CODE","PREFERRED_LANGUAGE_DESCRIPTION")}
       ${adar.car.onlyAllowValidFieldCombinationsInAllRows("RACE_CODE_DESCRIPTION","RACE_CODE")}

diff --git a/src/ahc-hrsn-elt/screening/orchestrate.ts b/src/ahc-hrsn-elt/screening/orchestrate.ts
@@ -17,7 +17,7 @@ import * as csv from "./csv.ts";
 import * as excel from "./excel.ts";
 import * as gov from "./governance.ts";
 
-export const ORCHESTRATE_VERSION = "0.16.1";
+export const ORCHESTRATE_VERSION = "0.16.2";
 
 export interface FhirRecord {
   PAT_MRN_ID: string;