deploy: 303a417

surveilr · Oct 28, 2024 · 9a7984e · 9a7984e
1 parent 96a16ef
commit 9a7984e
Show file tree

Hide file tree

Showing 59 changed files with 159 additions and 202 deletions.
diff --git a/404.html b/404.html
diff --git a/404.html.br b/404.html.br
diff --git a/blog/direct-messaging-service-pattern/index.html b/blog/direct-messaging-service-pattern/index.html
diff --git a/blog/direct-messaging-service-pattern/index.html.br b/blog/direct-messaging-service-pattern/index.html.br
diff --git a/blog/evidence-based-decision-making-pattern/index.html b/blog/evidence-based-decision-making-pattern/index.html
diff --git a/blog/evidence-based-decision-making-pattern/index.html.br b/blog/evidence-based-decision-making-pattern/index.html.br
diff --git a/blog/index.html b/blog/index.html
diff --git a/blog/index.html.br b/blog/index.html.br
diff --git a/blog/power-of-sql-and-sql-views/index.html b/blog/power-of-sql-and-sql-views/index.html
diff --git a/blog/power-of-sql-and-sql-views/index.html.br b/blog/power-of-sql-and-sql-views/index.html.br
diff --git a/blog/quality-management-pattern/index.html b/blog/quality-management-pattern/index.html
diff --git a/blog/quality-management-pattern/index.html.br b/blog/quality-management-pattern/index.html.br
diff --git a/blog/rssd-excel-portability-sql-power/index.html b/blog/rssd-excel-portability-sql-power/index.html
diff --git a/blog/rssd-excel-portability-sql-power/index.html.br b/blog/rssd-excel-portability-sql-power/index.html.br
diff --git a/blog/sql-based-etl-elt/index.html b/blog/sql-based-etl-elt/index.html
diff --git a/blog/sql-based-etl-elt/index.html.br b/blog/sql-based-etl-elt/index.html.br
diff --git a/blog/surveilr-core-vs-patterns/index.html b/blog/surveilr-core-vs-patterns/index.html
diff --git a/blog/surveilr-core-vs-patterns/index.html.br b/blog/surveilr-core-vs-patterns/index.html.br
diff --git a/blog/surveilr-integration-engine/index.html b/blog/surveilr-integration-engine/index.html
diff --git a/blog/surveilr-integration-engine/index.html.br b/blog/surveilr-integration-engine/index.html.br
diff --git a/blog/vendor-assessments/index.html b/blog/vendor-assessments/index.html
diff --git a/blog/vendor-assessments/index.html.br b/blog/vendor-assessments/index.html.br
diff --git a/blog/why-stateful-integration/index.html b/blog/why-stateful-integration/index.html
diff --git a/blog/why-stateful-integration/index.html.br b/blog/why-stateful-integration/index.html.br
diff --git a/contact/index.html b/contact/index.html
diff --git a/contact/index.html.br b/contact/index.html.br
diff --git a/index.html b/index.html
diff --git a/index.html.br b/index.html.br
diff --git a/insights/advanced-polyglot-orchestration/index.html b/insights/advanced-polyglot-orchestration/index.html
diff --git a/insights/advanced-polyglot-orchestration/index.html.br b/insights/advanced-polyglot-orchestration/index.html.br
diff --git a/insights/index.html b/insights/index.html
diff --git a/insights/index.html.br b/insights/index.html.br
diff --git a/insights/why-sqlite-for-rssd/index.html b/insights/why-sqlite-for-rssd/index.html
diff --git a/insights/why-sqlite-for-rssd/index.html.br b/insights/why-sqlite-for-rssd/index.html.br
diff --git a/legal/cli-eula/index.html b/legal/cli-eula/index.html
diff --git a/legal/cli-eula/index.html.br b/legal/cli-eula/index.html.br
diff --git a/lib/pattern/osquery/package.sql b/lib/pattern/osquery/package.sql
@@ -3,7 +3,7 @@ CREATE TEMP TABLE IF NOT EXISTS "session_state_ephemeral" (
     "value" TEXT NOT NULL
 );
 INSERT INTO "code_notebook_kernel" ("code_notebook_kernel_id", "kernel_name", "description", "mime_type", "file_extn", "elaboration", "governance", "created_at", "created_by", "updated_at", "updated_by", "deleted_at", "deleted_by", "activity_log") VALUES ('SQL', 'SQLite SQL Statements', NULL, 'application/sql', '.sql', NULL, NULL, (CURRENT_TIMESTAMP), (SELECT "value" FROM "session_state_ephemeral" WHERE "key" = 'current_user'), NULL, NULL, NULL, NULL, NULL) ON CONFLICT DO UPDATE SET  code_notebook_kernel_id = COALESCE(EXCLUDED.code_notebook_kernel_id, code_notebook_kernel_id), kernel_name = COALESCE(EXCLUDED.kernel_name, kernel_name), description = COALESCE(EXCLUDED.description, description), mime_type = COALESCE(EXCLUDED.mime_type, mime_type), file_extn = COALESCE(EXCLUDED.file_extn, file_extn), governance = COALESCE(EXCLUDED.governance, governance), elaboration = COALESCE(EXCLUDED.elaboration, elaboration), "updated_at" = CURRENT_TIMESTAMP, "updated_by" = (SELECT "value" FROM "session_state_ephemeral" WHERE "key" = 'current_user');
-INSERT INTO "code_notebook_cell" ("code_notebook_cell_id", "notebook_kernel_id", "notebook_name", "cell_name", "cell_governance", "interpretable_code", "interpretable_code_hash", "description", "arguments", "created_at", "created_by", "updated_at", "updated_by", "deleted_at", "deleted_by", "activity_log") VALUES ('01JB95PPEKNAHVCQ78HGV7ZRRP', 'SQL', 'osquery', 'infoSchemaOsQueryATCs', NULL, 'WITH table_columns AS (
+INSERT INTO "code_notebook_cell" ("code_notebook_cell_id", "notebook_kernel_id", "notebook_name", "cell_name", "cell_governance", "interpretable_code", "interpretable_code_hash", "description", "arguments", "created_at", "created_by", "updated_at", "updated_by", "deleted_at", "deleted_by", "activity_log") VALUES ('01JB9AH1004297ZZNWM25N2C72', 'SQL', 'osquery', 'infoSchemaOsQueryATCs', NULL, 'WITH table_columns AS (
     SELECT m.tbl_name AS table_name,
            group_concat(c.name) AS column_names_for_select,
            json_group_array(c.name) AS column_names_for_atc_json

diff --git a/lib/service/diabetes-research-hub/dataset-specific-package/anderson.sql b/lib/service/diabetes-research-hub/dataset-specific-package/anderson.sql
@@ -3311,23 +3311,7 @@ SELECT
     ''/drh/cgm-combined-data/index.sql'' AS link,
     ''Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.'' AS description,
     ''book''                as icon,
-    ''red''                    as color;
-
-
-SELECT
-    ''Combined CGM Tracing'' AS title,
-    ''/drh/cgm-combined-data/index.sql'' AS link,
-    ''Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.'' AS description,
-    ''book''                as icon,
-    ''red''                    as color;
-
-
-SELECT
-    ''Combined CGM Tracing'' AS title,
-    ''/drh/cgm-combined-data/index.sql'' AS link,
-    ''Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.'' AS description,
-    ''book''                as icon,
-    ''red''                    as color;
+    ''red''                    as color;         
 
 
 SELECT
@@ -4208,7 +4192,7 @@ FROM
 ''text'' as component,
 ''# Participant Dashboard'' as contents_md;
 
-    SET total_rows = (SELECT COUNT(*) FROM drh_participant);
+    SET total_rows = (SELECT COUNT(*) FROM study_combined_dashboard_participant_metrics_view);
 SET limit = COALESCE($limit, 50);
 SET offset = COALESCE($offset, 0);
 SET total_pages = ($total_rows + $limit - 1) / $limit;
@@ -4218,8 +4202,8 @@ SET current_page = ($offset / $limit) + 1;
   SELECT ''table'' AS component,
         ''participant_id'' as markdown,
         TRUE AS sort,
-        TRUE AS search;
-  SELECT format(''[%s](/drh/participant-info/index.sql?participant_id=%s)'',participant_id, participant_id) as participant_id,gender,age,study_arm,baseline_hba1c FROM drh_participant
+        TRUE AS search;        
+  SELECT format(''[%s](/drh/participant-info/index.sql?participant_id=%s)'',participant_id, participant_id) as participant_id,gender,age,study_arm,baseline_hba1c,tir,tar_vh,tar_h,tbr_l,tbr_vl,tar,tbr,gmi,percent_gv,gri,days_of_wear,data_start_date,data_end_date FROM study_combined_dashboard_participant_metrics_view
   LIMIT $limit
   OFFSET $offset;
 

diff --git a/lib/service/diabetes-research-hub/dataset-specific-package/dclp1-uva-study.sql.ts b/lib/service/diabetes-research-hub/dataset-specific-package/dclp1-uva-study.sql.ts
@@ -13,6 +13,16 @@ export class uvadclp1SqlPages extends spn.TypicalSqlPageNotebook {
         ${sqlStatements} 
     `;
   }
+
+  //metrics static views shall be generated after the combined_cgm_tracing is created.
+  async statelessMetricsSQL() {
+    // stateless SQL for the metrics
+    return await spn.TypicalSqlPageNotebook.fetchText(
+      import.meta.resolve(
+        "../drh-metrics.sql",
+      ),
+    );
+  }
 }
 
 export async function uvadclp1SQL() {
@@ -31,6 +41,7 @@ export async function uvadclp1SQL() {
           ),
         );
       }
+
     }(),    
     ...(await pkg.drhNotebooks()),
     new uvadclp1SqlPages(),

diff --git a/lib/service/diabetes-research-hub/drh-metrics.sql b/lib/service/diabetes-research-hub/drh-metrics.sql
@@ -9,75 +9,8 @@ FROM
     combined_cgm_tracing
 GROUP BY 
     participant_id;
-
 
--- Drop the view if it exists
-DROP VIEW IF EXISTS drh_mean_glucose;
-
--- Create the view to calculate mean glucose for each participant
-CREATE VIEW drh_mean_glucose AS
-SELECT 
-    participant_id,
-    ROUND(AVG(CGM_Value), 2) AS mean_glucose
-FROM 
-    combined_cgm_tracing
-GROUP BY 
-    participant_id;
 
-
-   -- Drop the view if it exists
-DROP VIEW IF EXISTS drh_cgm_worn_days;
-
--- Create the view to calculate the number of days CGM worn for each participant
-CREATE VIEW drh_cgm_worn_days AS
-SELECT 
-    participant_id,
-    COUNT(DISTINCT DATE(Date_Time)) AS number_of_days_cgm_worn
-FROM 
-    combined_cgm_tracing
-GROUP BY 
-    participant_id;
-
-
--- Drop the view if it exists
-DROP VIEW IF EXISTS drh_percentage_active_days;
-
--- Create the view to calculate the percentage of active days for each participant
-CREATE VIEW drh_percentage_active_days AS
-SELECT 
-    participant_id,
-    ROUND(
-        (COUNT(DISTINCT DATE(Date_Time)) / 
-        ROUND((julianday(MAX(Date_Time)) - julianday(MIN(Date_Time)) + 1))
-        ) * 100, 2) AS percentage_active
-FROM 
-    combined_cgm_tracing
-GROUP BY 
-    participant_id;
-
-
--- Drop the view if it exists
-DROP VIEW IF EXISTS drh_glucose_management_indicator;
-
--- Create the view to calculate the GMI for each participant
-CREATE VIEW drh_glucose_management_indicator AS
-SELECT 
-    participant_id,    
-    ROUND(AVG(CGM_Value) * 0.155 + 95, 2) AS gmi 
-FROM 
-    combined_cgm_tracing
-GROUP BY 
-    participant_id;
-
-
-DROP VIEW IF EXISTS drh_coefficient_of_variation;
--- Create the view to calculate the coefficient_of_variation for each participant
-CREATE VIEW drh_coefficient_of_variation AS  
-SELECT participant_id,ROUND((SQRT(AVG(CGM_Value * CGM_Value) - AVG(CGM_Value) * AVG(CGM_Value)) / AVG(CGM_Value)) * 100, 2) AS coefficient_of_variation 
-FROM combined_cgm_tracing 
-GROUP BY 
-    participant_id;
-
 
 DROP VIEW IF EXISTS drh_participant_metrics;
 
@@ -409,6 +342,59 @@ FROM (
 
 
 
+DROP VIEW IF EXISTS study_combined_dashboard_participant_metrics_view;
+CREATE VIEW study_combined_dashboard_participant_metrics_view AS
+WITH combined_data AS (
+    SELECT 
+        CAST(SUBSTR(dg.participant_id, 1, INSTR(dg.participant_id, '-') - 1) AS TEXT) AS study_id,        
+        dg.participant_id,
+        dg.gender,
+        dg.age,
+        dg.study_arm,
+        dg.baseline_hba1c,
+        ROUND(SUM(CASE WHEN dc.CGM_Value BETWEEN 70 AND 180 THEN 1 ELSE 0 END) * 1.0 / COUNT(dc.CGM_Value) * 100, 2) AS tir,
+        ROUND(SUM(CASE WHEN dc.CGM_Value > 250 THEN 1 ELSE 0 END) * 1.0 / COUNT(dc.CGM_Value) * 100, 2) AS tar_vh,
+        ROUND(SUM(CASE WHEN dc.CGM_Value BETWEEN 181 AND 250 THEN 1 ELSE 0 END) * 1.0 / COUNT(dc.CGM_Value) * 100, 2) AS tar_h,
+        ROUND(SUM(CASE WHEN dc.CGM_Value BETWEEN 54 AND 69 THEN 1 ELSE 0 END) * 1.0 / COUNT(dc.CGM_Value) * 100, 2) AS tbr_l,
+        ROUND(SUM(CASE WHEN dc.CGM_Value < 54 THEN 1 ELSE 0 END) * 1.0 / COUNT(dc.CGM_Value) * 100, 2) AS tbr_vl,
+        ROUND(SUM(CASE WHEN dc.CGM_Value > 180 THEN 1 ELSE 0 END) * 1.0 / COUNT(dc.CGM_Value)*100, 2) AS tar,
+        ROUND(SUM(CASE WHEN dc.CGM_Value < 70 THEN 1 ELSE 0 END) * 1.0 / COUNT(dc.CGM_Value)*100, 2) AS tbr,
+        CEIL((AVG(dc.CGM_Value) * 0.155) + 95) AS gmi,
+        ROUND((SQRT(AVG(dc.CGM_Value * dc.CGM_Value) - AVG(dc.CGM_Value) * AVG(dc.CGM_Value)) / AVG(dc.CGM_Value)) * 100, 2) AS percent_gv,
+        ROUND((3.0 * ((SUM(CASE WHEN dc.CGM_Value < 54 THEN 1 ELSE 0 END) * 100.0 / COUNT(*)) + (0.8 * (SUM(CASE WHEN dc.CGM_Value BETWEEN 54 AND 69 THEN 1 ELSE 0 END) * 100.0 / COUNT(*))))) + (1.6 * ((SUM(CASE WHEN dc.CGM_Value > 250 THEN 1 ELSE 0 END) * 100.0 / COUNT(*)) + (0.5 * (SUM(CASE WHEN dc.CGM_Value BETWEEN 181 AND 250 THEN 1 ELSE 0 END) * 100.0 / COUNT(*)) ))), 2) AS gri,
+        COUNT(DISTINCT DATE(dc.Date_Time)) AS days_of_wear,
+        MIN(DATE(dc.Date_Time)) AS data_start_date,
+        MAX(DATE(dc.Date_Time)) AS data_end_date
+    FROM drh_participant dg 
+    JOIN combined_cgm_tracing dc ON dg.participant_id = dc.participant_id
+    GROUP BY study_id, dg.participant_id, dg.gender, dg.age, dg.study_arm, dg.baseline_hba1c
+)
+SELECT *,
+    ROUND(
+        COALESCE(
+            (days_of_wear * 1.0 / 
+            (JULIANDAY(data_end_date) - JULIANDAY(data_start_date) + 1)) * 100, 
+            0), 
+        2) AS wear_time_percentage FROM combined_data;
+
+
+DROP VIEW IF EXISTS participant_cgm_date_range_view;
+CREATE VIEW participant_cgm_date_range_view AS 
+SELECT 
+    participant_id,
+    CAST(strftime('%Y-%m-%d', MIN(Date_Time)) AS TEXT) AS participant_cgm_start_date,
+    CAST(strftime('%Y-%m-%d', MAX(Date_Time)) AS TEXT) AS participant_cgm_end_date,
+    CAST(strftime('%Y-%m-%d', DATE(MAX(Date_Time), '-1 day')) AS TEXT) AS end_date_minus_1_day,
+    CAST(strftime('%Y-%m-%d', DATE(MAX(Date_Time), '-7 day')) AS TEXT) AS end_date_minus_7_days,
+    CAST(strftime('%Y-%m-%d', DATE(MAX(Date_Time), '-14 day')) AS TEXT) AS end_date_minus_14_days,
+    CAST(strftime('%Y-%m-%d', DATE(MAX(Date_Time), '-30 day')) AS TEXT) AS end_date_minus_30_days,
+    CAST(strftime('%Y-%m-%d', DATE(MAX(Date_Time), '-90 day')) AS TEXT) AS end_date_minus_90_days
+FROM 
+    combined_cgm_tracing  
+GROUP BY 
+    participant_id;
+
+
 
 
 

diff --git a/lib/service/diabetes-research-hub/package.sql b/lib/service/diabetes-research-hub/package.sql
@@ -1445,23 +1445,7 @@ SELECT
     ''/drh/cgm-combined-data/index.sql'' AS link,
     ''Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.'' AS description,
     ''book''                as icon,
-    ''red''                    as color;
-
-
-SELECT
-    ''Combined CGM Tracing'' AS title,
-    ''/drh/cgm-combined-data/index.sql'' AS link,
-    ''Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.'' AS description,
-    ''book''                as icon,
-    ''red''                    as color;
-
-
-SELECT
-    ''Combined CGM Tracing'' AS title,
-    ''/drh/cgm-combined-data/index.sql'' AS link,
-    ''Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.'' AS description,
-    ''book''                as icon,
-    ''red''                    as color;
+    ''red''                    as color;         
 
 
 SELECT
@@ -2342,7 +2326,7 @@ FROM
 ''text'' as component,
 ''# Participant Dashboard'' as contents_md;
 
-    SET total_rows = (SELECT COUNT(*) FROM drh_participant);
+    SET total_rows = (SELECT COUNT(*) FROM study_combined_dashboard_participant_metrics_view);
 SET limit = COALESCE($limit, 50);
 SET offset = COALESCE($offset, 0);
 SET total_pages = ($total_rows + $limit - 1) / $limit;
@@ -2352,8 +2336,8 @@ SET current_page = ($offset / $limit) + 1;
   SELECT ''table'' AS component,
         ''participant_id'' as markdown,
         TRUE AS sort,
-        TRUE AS search;
-  SELECT format(''[%s](/drh/participant-info/index.sql?participant_id=%s)'',participant_id, participant_id) as participant_id,gender,age,study_arm,baseline_hba1c FROM drh_participant
+        TRUE AS search;        
+  SELECT format(''[%s](/drh/participant-info/index.sql?participant_id=%s)'',participant_id, participant_id) as participant_id,gender,age,study_arm,baseline_hba1c,tir,tar_vh,tar_h,tbr_l,tbr_vl,tar,tbr,gmi,percent_gv,gri,days_of_wear,data_start_date,data_end_date FROM study_combined_dashboard_participant_metrics_view
   LIMIT $limit
   OFFSET $offset;
 

diff --git a/lib/service/diabetes-research-hub/package.sql.ts b/lib/service/diabetes-research-hub/package.sql.ts
@@ -285,24 +285,8 @@ export class DRHSqlPages extends spn.TypicalSqlPageNotebook {
                 '/drh/cgm-combined-data/index.sql' AS link,
                 'Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.' AS description,
                 'book'                as icon,
-                'red'                    as color;
-
-
-            SELECT
-                'Combined CGM Tracing' AS title,
-                '/drh/cgm-combined-data/index.sql' AS link,
-                'Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.' AS description,
-                'book'                as icon,
-                'red'                    as color;
-
-
-            SELECT
-                'Combined CGM Tracing' AS title,
-                '/drh/cgm-combined-data/index.sql' AS link,
-                'Explore the comprehensive CGM dataset, integrating glucose monitoring data from all participants for in-depth analysis of glycemic patterns and trends across the study.' AS description,
-                'book'                as icon,
-                'red'                    as color;
-
+                'red'                    as color;         
+            
 
             SELECT
                 'PHI De-Identification Results' AS title,
@@ -845,7 +829,7 @@ select
     siblingOrder: 12,
   })
   "drh/study-participant-dashboard/index.sql"() {
-    const viewName = `drh_participant`;
+    const viewName = `study_combined_dashboard_participant_metrics_view`;
     const pagination = this.pagination({ tableOrViewName: viewName });
     return this.SQL`
   ${this.activePageTitle()}
@@ -955,8 +939,8 @@ select
     SELECT 'table' AS component,
           'participant_id' as markdown,
           TRUE AS sort,
-          TRUE AS search;
-    SELECT format('[%s](/drh/participant-info/index.sql?participant_id=%s)',participant_id, participant_id) as participant_id,gender,age,study_arm,baseline_hba1c FROM ${viewName}
+          TRUE AS search;        
+    SELECT format('[%s](/drh/participant-info/index.sql?participant_id=%s)',participant_id, participant_id) as participant_id,gender,age,study_arm,baseline_hba1c,tir,tar_vh,tar_h,tbr_l,tbr_vl,tar,tbr,gmi,percent_gv,gri,days_of_wear,data_start_date,data_end_date FROM ${viewName}
     LIMIT $limit
     OFFSET $offset;
 

diff --git a/lib/service/diabetes-research-hub/study-specific-stateless/dclp1-stateless.sql b/lib/service/diabetes-research-hub/study-specific-stateless/dclp1-stateless.sql
@@ -1238,7 +1238,7 @@ SET
     diagnostics_json = '{"status": "completed"}',     -- Diagnostics status in JSON format
     diagnostics_md = 'Verification Validation process completed'  -- Markdown summary
 WHERE orchestration_session_id = (SELECT orchestration_session_id FROM temp_session_info LIMIT 1);  -- Update the session identified in the temp view
-
+------------------------------------------------------------------------------------------------------------------------------------
 
 -- Drop and recreate the device view
 DROP VIEW IF EXISTS drh_device;
@@ -1376,12 +1376,6 @@ SELECT
     study_id, site_id, site_name, site_type
 FROM uniform_resource_site;
 
--- SQLPage query to count tables matching the pattern 'uniform_resource_cgm_tracing%'
-DROP VIEW IF EXISTS drh_number_of_cgm_tracing_files_view;
-CREATE VIEW drh_number_of_cgm_tracing_files_view AS
-SELECT COUNT(*) AS table_count
-FROM sqlite_master
-WHERE type = 'table' AND name LIKE 'uniform_resource_cgm_tracing%';
 
 -- Drop and recreate the vw_orchestration_deidentify view
 DROP VIEW IF EXISTS drh_vw_orchestration_deidentify;
@@ -1481,6 +1475,19 @@ SELECT count(*) as number_of_cgm_raw_files
 FROM sqlite_master
 WHERE type = 'table' AND name LIKE 'uniform_resource_cgm_tracing%';
 
+DROP VIEW IF EXISTS study_wise_csv_file_names;
+CREATE VIEW study_wise_csv_file_names AS
+SELECT name 
+FROM sqlite_master
+WHERE type = 'table' AND name LIKE 'uniform_resource_%' and name !='uniform_resource_transform';
+
+
+DROP VIEW IF EXISTS study_wise_number_cgm_raw_files_count;
+CREATE VIEW study_wise_number_cgm_raw_files_count AS
+SELECT count(*) as number_of_cgm_raw_files
+FROM sqlite_master
+WHERE type = 'table' AND name LIKE 'uniform_resource_cgm_tracing%';
+
 
 -- DROP VIEW IF EXISTS drh_participant_file_names;
 -- CREATE VIEW IF NOT EXISTS drh_participant_file_names AS
@@ -1505,11 +1512,12 @@ SELECT s.study_id,
        (CAST(SUM(CASE WHEN p.gender = 'F' THEN 1 ELSE 0 END) AS FLOAT) / COUNT(*)) * 100 AS percentage_of_females, 
        GROUP_CONCAT(DISTINCT i.investigator_name) AS investigators 
 FROM uniform_resource_study s 
-LEFT JOIN uniform_resource_participant p ON s.study_id = p.study_id 
+LEFT JOIN drh_participant p ON s.study_id = p.study_id 
 LEFT JOIN uniform_resource_investigator i ON s.study_id = i.study_id 
 GROUP BY s.study_id, s.study_name, s.study_description, s.start_date, s.end_date, s.nct_number;
 
 
+
 DROP TABLE IF EXISTS raw_cgm_lst_cached;
 CREATE TABLE raw_cgm_lst_cached AS 
   SELECT * FROM drh_raw_cgm_table_lst;

diff --git a/lib/service/diabetes-research-hub/study-specific-stateless/generate-cgm-combined-sql.ts b/lib/service/diabetes-research-hub/study-specific-stateless/generate-cgm-combined-sql.ts
@@ -105,7 +105,7 @@ export function generateDetrendedDSCombinedCGMViewSQL(dbFilePath: string): strin
     // Generate SQL for each participant's CGM data
     sqlParts.push(`
       SELECT 
-        '${participantId}' AS participant_id, 
+        TRIM('DFA-'||'${participantId}') AS participant_id, 
         TRIM('2012-01-01 ' || hora ) AS Date_Time,
         CAST(glucemia AS REAL) AS CGM_Value 
       FROM ${table_name}