Merge pull request #183 from megin1989/main

Update to version 0.30.2

src/ahc-hrsn-elt/reference-data/business-rules.csv

@@ -17,7 +17,7 @@ Screening,ENCOUNTER_TYPE_CODE_DESCRIPTION,No,ENCOUNTER_TYPE REFERENCE,No,,
 Screening,SCREENING_STATUS_CODE,Yes,SCREENING_STATUS_REFERENCE,Yes,,Yes
 Screening,SCREENING_STATUS_CODE_DESCRIPTION,No,SCREENING_STATUS_REFERENCE,No,,Yes
 Screening,SCREENING_STATUS_CODE_SYSTEM,Yes,SCREENING_STATUS_REFERENCE,No,,Yes
-Screening,SCREENING_CODE_DESCRIPTION,Yes,Accountable health communities (AHC) health-related social needs screening (HRSN) tool (96777-8) or Accountable health communities (AHC) health-related social needs (HRSN) supplemental questions,Yes,,Yes
+Screening,SCREENING_CODE_DESCRIPTION,Yes,Accountable health communities (AHC) health-related social needs screening (HRSN) tool (96777-8) or Accountable health communities (AHC) health-related social needs (HRSN) supplemental questions or NYS AHC HRSN screening,Yes,,Yes
 Screening,SCREENING_CODE_SYSTEM_NAME,Yes,LN or LOINC,Yes,,Yes
 Screening,SCREENING_CODE,Yes,96777-8 or 97023-6,Yes,,Yes
 Screening,RECORDED_TIME,Yes,Date Time- Format: YYYYMMDD HH:MM:SS YYYY is not before 2023.,Rejection if empty,,Can normalize to this format
@@ -51,15 +51,17 @@ Admin_Demographic,ADDRESS2,No,Is not a string of numbers,,Could be an issue if t
 Admin_Demographic,CITY,Yes,Is a city in New York State.,Yes,Could be an issue if the patient has an address- provide feedback,
 Admin_Demographic,STATE,Yes,New York or NY,Yes,,
 Admin_Demographic,ZIP,Yes,All numeric: 5 or 9 digits,Yes,,
+Admin_Demographic,PHONE,No,,No,,
+Admin_Demographic,SSN,No,,No,,
 Admin_Demographic,GENDER_IDENTITY_CODE_SYSTEM_NAME,No,SNOMED-CT or SNOMED,No,,"If code is available, yes"
 Admin_Demographic,GENDER_IDENTITY_CODE,No,See GENDER_IDENTITY tab,No,,
 Admin_Demographic,GENDER_IDENTITY_DESCRIPTION,No,See GENDER_IDENTITY tab,No,,"If code is available, yes"
 Admin_Demographic,SEXUAL_ORIENTATION_CODE_SYSTEM_NAME,No,SNOMED-CT or SNOMED,No,,"If code is available, yes"
 Admin_Demographic,SEXUAL_ORIENTATION_CODE,No,See SEXUAL_ORIENTATION tab,No,,
-Admin_Demographic,SEXUAL_ORIENTATION_DESCRIPTION,No,"Bisexual, Heterosexual , Homosexual, Other, Unknown",No,,"If code is available, yes"
+Admin_Demographic,SEXUAL_ORIENTATION_CODE_DESCRIPTION,No,"Bisexual, Heterosexual , Homosexual, Other, Unknown",No,,"If code is available, yes"
 Admin_Demographic,PREFERRED_LANGUAGE_CODE_SYSTEM_NAME,No,ISO or ISO 639-2,No,,"If code is available, yes"
 Admin_Demographic,PREFERRED_LANGUAGE_CODE,No,"If available, is complete across all rows � Codes align with ISO. PREFERRED_LANGUAGE tab ",No,,
-Admin_Demographic,PREFERRED_LANGUAGE_DESCRIPTION,No,"If available, is complete across all rows � Codes align with ISO. PREFERRED_LANGUAGE tab",No,,"If code is available, yes"
+Admin_Demographic,PREFERRED_LANGUAGE_CODE_DESCRIPTION,No,"If available, is complete across all rows � Codes align with ISO. PREFERRED_LANGUAGE tab",No,,"If code is available, yes"
 Admin_Demographic,RACE_CODE_SYSTEM_NAME,No, CDC or CDCRE,No,,"If code is available, yes"
 Admin_Demographic,RACE_CODE,No,Aligns with CDC version 1.2- RACE tab,No,,
 Admin_Demographic,RACE_CODE_DESCRIPTION,No,Aligns with CDC version 1.2- RACE tab,No,,"If code is available, yes"

src/ahc-hrsn-elt/screening/csv.ts

@@ -72,6 +72,8 @@ const adminDemographicCsvColumnNames = [
   "CITY",
   "STATE",
   "ZIP",
+  "PHONE",
+  "SSN",
   "GENDER_IDENTITY_CODE_SYSTEM_NAME",
   "GENDER_IDENTITY_CODE",
   "GENDER_IDENTITY_CODE_DESCRIPTION",

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.30.1";
+export const ORCHESTRATE_VERSION = "0.30.2";
 
 export interface FhirRecord {
   PAT_MRN_ID: string;

support/assurance/ahc-hrsn-elt/screening/results-test-e2e/dag.puml

@@ -5,19 +5,55 @@ queue daginit as "init"
 label dagingest as "ingest"
 label dagensureContent as "ensureContent"
 label dagemitResources as "emitResources"
+label dagcheckRequiredTables as "checkRequiredTables"
+label dagcreateFhirViewQuery as "createFhirViewQuery"
+label dagcreateCteFhirPatient as "createCteFhirPatient"
+label dagcreateCteFhirConsent as "createCteFhirConsent"
+label dagcreateCteFhirOrg as "createCteFhirOrg"
+label dagcreateDerivedFromCte as "createDerivedFromCte"
+label dagcreateCteFhirObservation as "createCteFhirObservation"
+label dagcreateCteFhirObservationGrouper as "createCteFhirObservationGrouper"
+label dagcreateCteFhirEncounter as "createCteFhirEncounter"
 rectangle gprepareInit as "prepareInit"
 rectangle ginit as "init"
 rectangle gingest as "ingest"
 rectangle gensureContent as "ensureContent"
 rectangle gemitResources as "emitResources"
+rectangle gcheckRequiredTables as "checkRequiredTables"
+rectangle gcreateFhirViewQuery as "createFhirViewQuery"
+rectangle gcreateCteFhirPatient as "createCteFhirPatient"
+rectangle gcreateCteFhirConsent as "createCteFhirConsent"
+rectangle gcreateCteFhirOrg as "createCteFhirOrg"
+rectangle gcreateDerivedFromCte as "createDerivedFromCte"
+rectangle gcreateCteFhirObservation as "createCteFhirObservation"
+rectangle gcreateCteFhirObservationGrouper as "createCteFhirObservationGrouper"
+rectangle gcreateCteFhirEncounter as "createCteFhirEncounter"
 DAG --> dagprepareInit
 dagprepareInit --> daginit
 daginit --> dagingest
 dagingest --> dagensureContent
 dagensureContent --> dagemitResources
+dagemitResources --> dagcheckRequiredTables
+dagcheckRequiredTables --> dagcreateFhirViewQuery
+dagcreateFhirViewQuery --> dagcreateCteFhirPatient
+dagcreateCteFhirPatient --> dagcreateCteFhirConsent
+dagcreateCteFhirConsent --> dagcreateCteFhirOrg
+dagcreateCteFhirOrg --> dagcreateDerivedFromCte
+dagcreateDerivedFromCte --> dagcreateCteFhirObservation
+dagcreateCteFhirObservation --> dagcreateCteFhirObservationGrouper
+dagcreateCteFhirObservationGrouper --> dagcreateCteFhirEncounter
 Graph --> gprepareInit
 gprepareInit --> ginit
 ginit --> gingest
 gingest --> gensureContent
 gensureContent --> gemitResources
+gemitResources --> gcheckRequiredTables
+gcheckRequiredTables --> gcreateFhirViewQuery
+gcreateFhirViewQuery --> gcreateCteFhirPatient
+gcreateCteFhirPatient --> gcreateCteFhirConsent
+gcreateCteFhirConsent --> gcreateCteFhirOrg
+gcreateCteFhirOrg --> gcreateDerivedFromCte
+gcreateDerivedFromCte --> gcreateCteFhirObservation
+gcreateCteFhirObservation --> gcreateCteFhirObservationGrouper
+gcreateCteFhirObservationGrouper --> gcreateCteFhirEncounter
 @enduml