Merge pull request #1049 from megin1989/main

fix: add CCDA records to the need attention section and home page mermaid diagrams #1011
tech-by-design · Jan 16, 2025 · 532a47b · 532a47b
2 parents 2f2db3c + e167d26
commit 532a47b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar b/hub-prime/lib/techbd-udi-jooq-ingress.auto.jar
diff --git a/support/specifications/flat-file/datapackage-nyher-fhir-ig-equivalent.json b/support/specifications/flat-file/datapackage-nyher-fhir-ig-equivalent.json
@@ -68,12 +68,12 @@
         "unknown"
       ]
     }},
-    {"name": "ENCOUNTER_TYPE_CODE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').type.coding.code", "constraints": { "enum": [
+    {"name": "ENCOUNTER_TYPE_CODE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').type.coding.code", "constraints": { "required": true, "enum": [ 
       "405672008", "23918007"
     ]
     } },
     {"name": "ENCOUNTER_TYPE_CODE_DESCRIPTION", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').type.text"},
-    {"name": "ENCOUNTER_TYPE_CODE_SYSTEM", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').type.coding.system", "constraints": {"enum": [
+    {"name": "ENCOUNTER_TYPE_CODE_SYSTEM", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Encounter').type.coding.system", "constraints": { "required": true, "enum": [
       "http://snomed.info/sct"
     ]
     } },
@@ -83,7 +83,7 @@
    { "name": "CONSENT_LAST_UPDATED", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Consent').meta.lastUpdated", "constraints": {"required": true, 
    "pattern": "^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\\.[0-9]+)?(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))$"
   } },       
-  { "name": "CONSENT_DATE_TIME", "type": "string" , "description":"Bundle.entry.resource.where(resourceType ='Consent').dateTime", "constraints": { 
+  { "name": "CONSENT_DATE_TIME", "type": "string" , "description":"Bundle.entry.resource.where(resourceType ='Consent').dateTime", "constraints": { "required": true,
     "pattern": "^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\\.[0-9]+)?(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))$"
     } },
     { "name": "CONSENT_STATUS", "description":"Bundle.entry.resource.where(resourceType ='Consent').status", "type": "string",  "constraints": {"required": true, "enum":[
@@ -94,7 +94,7 @@
       "inactive",
       "entered-in-error"
     ]} },    
-    { "name": "CONSENT_POLICY_AUTHORITY", "description":"Bundle.entry.resource.where(resourceType ='Consent').policy.authority", "type": "string" },    
+    { "name": "CONSENT_POLICY_AUTHORITY", "description":"Bundle.entry.resource.where(resourceType ='Consent').policy.authority", "type": "string",  "constraints": {"required": true} },    
     { "name": "CONSENT_PROVISION_TYPE", "type": "string", "description":"Bundle.entry.resource.where(resourceType ='Consent').provision.type", "constraints": { "enum": ["deny","permit"]} },
     { "name": "SCREENING_LAST_UPDATED", "type": "string" , "description":"Bundle.entry.resource.where(resourceType ='Observation').meta.lastUpdated",  "constraints": { "required": true,
     "pattern": "^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\\.[0-9]+)?(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))$"

diff --git a/support/specifications/flat-file/documentation.auto.md b/support/specifications/flat-file/documentation.auto.md
@@ -100,6 +100,7 @@
   - `description` Bundle.entry.resource.where(resourceType ='Encounter').type.coding.code
   - `type` string
   - `constraints`:
+    - `required` True
     - `enum` ['405672008', '23918007']
 ### `ENCOUNTER_TYPE_CODE_DESCRIPTION`
   - `description` Bundle.entry.resource.where(resourceType ='Encounter').type.text
@@ -108,6 +109,7 @@
   - `description` Bundle.entry.resource.where(resourceType ='Encounter').type.coding.system
   - `type` string
   - `constraints`:
+    - `required` True
     - `enum` ['http://snomed.info/sct']
 ### `ENCOUNTER_LAST_UPDATED`
   - `description` Bundle.entry.resource.where(resourceType ='Encounter').meta.lastUpdated
@@ -125,6 +127,7 @@
   - `description` Bundle.entry.resource.where(resourceType ='Consent').dateTime
   - `type` string
   - `constraints`:
+    - `required` True
     - `pattern` `^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))$`
 ### `CONSENT_STATUS`
   - `description` Bundle.entry.resource.where(resourceType ='Consent').status
@@ -135,6 +138,8 @@
 ### `CONSENT_POLICY_AUTHORITY`
   - `description` Bundle.entry.resource.where(resourceType ='Consent').policy.authority
   - `type` string
+  - `constraints`:
+    - `required` True
 ### `CONSENT_PROVISION_TYPE`
   - `description` Bundle.entry.resource.where(resourceType ='Consent').provision.type
   - `type` string

diff --git a/udi-prime/src/main/postgres/ingestion-center/001_idempotent_interaction.psql b/udi-prime/src/main/postgres/ingestion-center/001_idempotent_interaction.psql
@@ -1134,7 +1134,7 @@ WITH combined_counts AS (
                 END) AS shinny_datalake_submissions,
             max(sihr.created_at) AS recently_created_at
            FROM techbd_udi_ingress.sat_interaction_fhir_request sihr
-          WHERE sihr.created_at >= (CURRENT_DATE - '7 days'::interval) AND (sihr.uri = ANY (ARRAY['/Bundle/'::text, '/Bundle'::text])) AND (sihr.tenant_id_lower = ANY (ARRAY['healthelink'::text, 'healtheconn'::text, 'healthix'::text, 'grrhio'::text, 'hixny'::text]))
+          WHERE sihr.created_at >= (CURRENT_DATE - '7 days'::interval) AND (sihr.uri = ANY (ARRAY['/Bundle/', '/Bundle','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/', '/ccda/Bundle', '/ccda/Bundle/'])) AND (sihr.tenant_id_lower = ANY (ARRAY['healthelink'::text, 'healtheconn'::text, 'healthix'::text, 'grrhio'::text, 'hixny'::text]))
           GROUP BY sihr.tenant_id_lower
         )
  SELECT  
@@ -3547,7 +3547,7 @@ BEGIN
             max(sihr.created_at) AS recently_created_at
         FROM techbd_udi_ingress.sat_interaction_fhir_request sihr
         WHERE 
-            sihr.uri = ANY (ARRAY['/Bundle', '/Bundle/','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/'])
+            sihr.uri = ANY (ARRAY['/Bundle', '/Bundle/','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/', '/ccda/Bundle', '/ccda/Bundle/'])
             AND sihr.created_at >= TO_TIMESTAMP(start_date::text, 'YYYY-MM-DD') 
             AND sihr.created_at < TO_TIMESTAMP(end_date::text, 'YYYY-MM-DD') + INTERVAL '1 day'
             AND sihr.tenant_id <> 'N/A'
@@ -3704,7 +3704,7 @@ BEGIN
             techbd_udi_ingress.sat_interaction_fhir_request sihr
          WHERE 
             sihr.nature = ''Forwarded HTTP Response Error''
-            AND sihr.uri = ANY (ARRAY[''/Bundle/'', ''/Bundle'', ''/flatfile/csv/Bundle'', ''/flatfile/csv/Bundle/''])
+            AND sihr.uri = ANY (ARRAY[''/Bundle/'', ''/Bundle'', ''/flatfile/csv/Bundle'', ''/flatfile/csv/Bundle/'', ''/ccda/Bundle'', ''/ccda/Bundle/''])
             AND sihr.created_at >= TO_TIMESTAMP($1::text, ''YYYY-MM-DD'') 
 	        AND sihr.created_at < TO_TIMESTAMP($2::text, ''YYYY-MM-DD'') + INTERVAL ''1 day''
             AND sihr.tenant_id_lower = $3
@@ -3737,7 +3737,7 @@ BEGIN
     WHERE 
         sihr.tenant_id_lower = tenant_id_param
         AND sihr.nature = 'org.techbd.service.http.Interactions$RequestResponseEncountered'
-        AND sihr.uri = ANY (ARRAY['/Bundle/', '/Bundle'])
+        AND sihr.uri = ANY (ARRAY['/Bundle/', '/Bundle','/flatfile/csv/Bundle', '/flatfile/csv/Bundle/', '/ccda/Bundle', '/ccda/Bundle/'])
         AND sihr.created_at >= TO_TIMESTAMP(start_date_param::text, 'YYYY-MM-DD') 
         AND sihr.created_at < TO_TIMESTAMP(end_date_param::text, 'YYYY-MM-DD') + INTERVAL '1 day'
         AND NOT EXISTS (