diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbit/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbit/selector.json index 9acca732c..3415a1fe6 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbit/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbit/selector.json @@ -1,10 +1,10 @@ { "name": "tanagra-fitbit", - "displayName": "Fitbit data", + "displayName": "Has Any Fitbit Data", "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitActivitySummary/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitActivitySummary/selector.json index f29d911e3..4301de2f0 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitActivitySummary/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitActivitySummary/selector.json @@ -1,10 +1,10 @@ { "name": "tanagra-fitbit-activity-summary", - "displayName": "Fitbit Activity Summary", + "displayName": "Has Fitbit Activity Summary", "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitDevice/fitbitDevice.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitDevice/fitbitDevice.json new file mode 100644 index 000000000..a4039e3af --- /dev/null +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitDevice/fitbitDevice.json @@ -0,0 +1,3 @@ +{ + "attribute": "has_fitbit_device" +} \ No newline at end of file diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitDevice/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitDevice/selector.json new file mode 100644 index 000000000..00e7bd8c8 --- /dev/null +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitDevice/selector.json @@ -0,0 +1,15 @@ +{ + "name": "tanagra-fitbit-device", + "displayName": "Has Fitbit Device", + "isEnabledForCohorts": true, + "isEnabledForDataFeatureSets": false, + "display": { + "category": "Wearables", + "tags": null + }, + "filterBuilder": "core.PrimaryEntityFilterBuilder", + "plugin": "attribute", + "pluginConfig": null, + "pluginConfigFile": "fitbitDevice.json", + "modifiers": null +} \ No newline at end of file diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateLevel/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateLevel/selector.json index 4e164d53b..b9e77105d 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateLevel/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateLevel/selector.json @@ -1,10 +1,10 @@ { "name": "tanagra-fitbit-heart-rate-level", - "displayName": "Fitbit Heart Rate Minute Level", + "displayName": "Has Fitbit Heart Rate Minute Level", "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateSummary/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateSummary/selector.json index 6fead6ff2..951022c92 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateSummary/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitHeartRateSummary/selector.json @@ -1,10 +1,10 @@ { "name": "tanagra-fitbit-heart-rate-summary", - "displayName": "Fitbit Heart Rate Summary", + "displayName": "Has Fitbit Heart Rate Summary", "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitPlusDevice/fitbitPlusDevice.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitPlusDevice/fitbitPlusDevice.json new file mode 100644 index 000000000..dd076a194 --- /dev/null +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitPlusDevice/fitbitPlusDevice.json @@ -0,0 +1,3 @@ +{ + "attribute": "has_fitbit_plus_device" +} \ No newline at end of file diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitPlusDevice/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitPlusDevice/selector.json new file mode 100644 index 000000000..e136e7ade --- /dev/null +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitPlusDevice/selector.json @@ -0,0 +1,15 @@ +{ + "name": "tanagra-fitbit-plus-device", + "displayName": "Has Any Fitbit Data Plus Device", + "isEnabledForCohorts": true, + "isEnabledForDataFeatureSets": false, + "display": { + "category": "Wearables", + "tags": null + }, + "filterBuilder": "core.PrimaryEntityFilterBuilder", + "plugin": "attribute", + "pluginConfig": null, + "pluginConfigFile": "fitbitPlusDevice.json", + "modifiers": null +} \ No newline at end of file diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepDailySummary/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepDailySummary/selector.json index 9fec7d78e..f83bfb61d 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepDailySummary/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepDailySummary/selector.json @@ -1,10 +1,10 @@ { "name": "tanagra-fitbit-sleep-daily-summary", - "displayName": "Fitbit Sleep Daily Summary", + "displayName": "Has Fitbit Sleep Daily Summary", "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepLevel/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepLevel/selector.json index 0e04a3184..cca7252b4 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepLevel/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitSleepLevel/selector.json @@ -1,10 +1,10 @@ { "name": "tanagra-fitbit-sleep-level", - "displayName": "Fitbit Sleep Level", + "displayName": "Has Fitbit Sleep Level", "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitStepsIntraday/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitStepsIntraday/selector.json index 9f16ac2b6..96c135fcf 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitStepsIntraday/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/fitbitStepsIntraday/selector.json @@ -1,10 +1,10 @@ { "name": "tanagra-fitbit-steps-intraday", - "displayName": "Fitbit Steps Intraday", + "displayName": "Has Fitbit Steps Intraday", "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/pregnant.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/pregnant.json index aedb57cfc..092b06a90 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/pregnant.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/pregnant.json @@ -1,8 +1,3 @@ { - "entity": "pregnant", - "valueConfigs": [ - { - "attribute": "pregnant_at_enrollment" - } - ] + "attribute": "has_pregnant_at_enrollment" } diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/selector.json index 2a85f1e42..73adc2098 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/pregnant/selector.json @@ -7,8 +7,8 @@ "category": "Physical Measurements", "tags": null }, - "filterBuilder": "core.MultiAttributeFilterBuilder", - "plugin": "multiAttribute", + "filterBuilder": "core.PrimaryEntityFilterBuilder", + "plugin": "attribute", "pluginConfig": null, "pluginConfigFile": "pregnant.json", "modifiers": null diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wearConsent/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wearConsent/selector.json index 6ba73f492..b834aa384 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wearConsent/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wearConsent/selector.json @@ -4,7 +4,7 @@ "isEnabledForCohorts": true, "isEnabledForDataFeatureSets": false, "display": { - "category": "Fitbit", + "category": "Wearables", "tags": null }, "filterBuilder": "core.PrimaryEntityFilterBuilder", diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/selector.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/selector.json index 7af0d5929..f504246e3 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/selector.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/selector.json @@ -7,8 +7,8 @@ "category": "Physical Measurements", "tags": null }, - "filterBuilder": "core.MultiAttributeFilterBuilder", - "plugin": "multiAttribute", + "filterBuilder": "core.PrimaryEntityFilterBuilder", + "plugin": "attribute", "pluginConfig": null, "pluginConfigFile": "wheelchair.json", "modifiers": null diff --git a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/wheelchair.json b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/wheelchair.json index 3b2fb6465..bb0cd4f71 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/wheelchair.json +++ b/underlay/src/main/resources/config/criteria/aouRT/criteriaselector/wheelchair/wheelchair.json @@ -1,8 +1,3 @@ { - "entity": "wheelchair", - "valueConfigs": [ - { - "attribute": "wheelchair_at_enrollment" - } - ] + "attribute": "has_wheelchair_at_enrollment" } diff --git a/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_actvity_summary_id/fitbitActvitySummaryId.json b/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_activity_summary_id/fitbitActvitySummaryId.json similarity index 100% rename from underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_actvity_summary_id/fitbitActvitySummaryId.json rename to underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_activity_summary_id/fitbitActvitySummaryId.json diff --git a/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_actvity_summary_id/prepackaged.json b/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_activity_summary_id/prepackaged.json similarity index 77% rename from underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_actvity_summary_id/prepackaged.json rename to underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_activity_summary_id/prepackaged.json index a910b3123..59ca38e9b 100644 --- a/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_actvity_summary_id/prepackaged.json +++ b/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_activity_summary_id/prepackaged.json @@ -1,5 +1,5 @@ { - "name": "_fitbit_actvity_summary_id", + "name": "_fitbit_activity_summary_id", "displayName": "Fitbit Activity Summary", "criteriaSelector": "outputUnfiltered", "pluginDataFile": "fitbitActvitySummaryId.json" diff --git a/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_device_id/fitbitDeviceId.json b/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_device_id/fitbitDeviceId.json new file mode 100644 index 000000000..288f735dd --- /dev/null +++ b/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_device_id/fitbitDeviceId.json @@ -0,0 +1,5 @@ +{ + "entities": [ + "wearableDevice" + ] +} \ No newline at end of file diff --git a/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_device_id/prepackaged.json b/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_device_id/prepackaged.json new file mode 100644 index 000000000..1a86b4d23 --- /dev/null +++ b/underlay/src/main/resources/config/criteria/aouRT/prepackagedcriteria/_fitbit_device_id/prepackaged.json @@ -0,0 +1,6 @@ +{ + "name": "_fitbit_device_id", + "displayName": "Fitbit Device", + "criteriaSelector": "outputUnfiltered", + "pluginDataFile": "fitbitDeviceId.json" +} \ No newline at end of file diff --git a/underlay/src/main/resources/config/datamapping/aouCT/entity/person/all.sql b/underlay/src/main/resources/config/datamapping/aouCT/entity/person/all.sql index 19fb8d4f9..2541feb82 100644 --- a/underlay/src/main/resources/config/datamapping/aouCT/entity/person/all.sql +++ b/underlay/src/main/resources/config/datamapping/aouCT/entity/person/all.sql @@ -54,9 +54,14 @@ SELECT p.person_id, WHEN sds.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_sleep_daily_summary, CASE WHEN sl.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_sleep_level, + CASE + WHEN dev.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_device, CASE WHEN asum.person_id IS NULL AND hrml.person_id IS NULL AND hrs.person_id IS NULL AND si.person_id IS NULL AND sds.person_id IS NULL AND sl.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit, + CASE + WHEN asum.person_id IS NULL AND hrml.person_id IS NULL AND hrs.person_id IS NULL + AND si.person_id IS NULL AND sds.person_id IS NULL AND sl.person_id IS NULL AND dev.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_plus_device, CASE WHEN wgv.sample_name IS NULL THEN FALSE ELSE TRUE END has_whole_genome_variant, CASE @@ -71,6 +76,10 @@ SELECT p.person_id, WHEN ehr.person_id IS NULL THEN FALSE ELSE TRUE END has_ehr_data, CASE WHEN pm.person_id IS NULL THEN FALSE ELSE TRUE END has_pm_data, + CASE + WHEN pregnant.person_id IS NULL THEN FALSE ELSE TRUE END has_pregnant_at_enrollment, + CASE + WHEN wheelchair.person_id IS NULL THEN FALSE ELSE TRUE END has_wheelchair_at_enrollment, CASE WHEN d.death_date is null THEN FALSE ELSE TRUE END is_deceased FROM `${omopDataset}.person` p @@ -85,6 +94,7 @@ LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.heart_rate_summary`) h LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.steps_intraday`) si ON (p.person_id = si.person_id) LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.sleep_daily_summary`) sds ON (p.person_id = sds.person_id) LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.sleep_level`) sl ON (p.person_id = sl.person_id) +LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.device`) dev ON (p.person_id = dev.person_id) LEFT JOIN (SELECT DISTINCT sample_name FROM `${omopDataset}.prep_wgs_metadata`) wgv ON (CAST(p.person_id AS STRING) = wgv.sample_name) LEFT JOIN (SELECT DISTINCT sample_name FROM `${omopDataset}.prep_microarray_metadata`) mad ON (CAST(p.person_id AS STRING) = mad.sample_name) LEFT JOIN (SELECT DISTINCT sample_name FROM `${omopDataset}.prep_longreads_metadata`) lrwgv ON (CAST(p.person_id AS STRING) = lrwgv.sample_name) @@ -126,5 +136,13 @@ LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.measurement` AND domain_id = 'Measurement' ) ) pm ON (p.person_id = pm.person_id) +LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.observation` + WHERE observation_source_concept_id = 903120 + AND value_as_concept_id = 45877994 +) pregnant ON (p.person_id = pregnant.person_id) +LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.measurement` + WHERE measurement_source_concept_id = 903111 + AND value_as_concept_id = 4023190 +) wheelchair ON (p.person_id = wheelchair.person_id) LEFT JOIN (SELECT person_id, max(death_date) as death_date FROM `${omopDataset}.death` GROUP BY person_id) d ON (p.person_id = d.person_id) diff --git a/underlay/src/main/resources/config/datamapping/aouCT/entity/person/entity.json b/underlay/src/main/resources/config/datamapping/aouCT/entity/person/entity.json index 15c953e5c..425698cfb 100644 --- a/underlay/src/main/resources/config/datamapping/aouCT/entity/person/entity.json +++ b/underlay/src/main/resources/config/datamapping/aouCT/entity/person/entity.json @@ -57,6 +57,8 @@ { "name": "has_fitbit_sleep_daily_summary", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_fitbit_sleep_level", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_fitbit", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_fitbit_device", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_fitbit_plus_device", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_array_data", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_whole_genome_variant", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_lr_whole_genome_variant", "dataType": "BOOLEAN", "isSuppressedForExport": true }, @@ -64,6 +66,8 @@ { "name": "has_wear_consent", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_ehr_data", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_pm_data", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_pregnant_at_enrollment", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_wheelchair_at_enrollment", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "is_deceased", "dataType": "BOOLEAN", "isSuppressedForExport": true } ], "idAttribute": "id", diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/person/all.sql b/underlay/src/main/resources/config/datamapping/aouRT/entity/person/all.sql index 8fe382175..16b7dc907 100644 --- a/underlay/src/main/resources/config/datamapping/aouRT/entity/person/all.sql +++ b/underlay/src/main/resources/config/datamapping/aouRT/entity/person/all.sql @@ -50,15 +50,24 @@ SELECT p.person_id, WHEN sds.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_sleep_daily_summary, CASE WHEN sl.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_sleep_level, + CASE + WHEN dev.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_device, CASE WHEN asum.person_id IS NULL AND hrml.person_id IS NULL AND hrs.person_id IS NULL AND si.person_id IS NULL AND sds.person_id IS NULL AND sl.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit, + CASE + WHEN asum.person_id IS NULL AND hrml.person_id IS NULL AND hrs.person_id IS NULL + AND si.person_id IS NULL AND sds.person_id IS NULL AND sl.person_id IS NULL AND dev.person_id IS NULL THEN FALSE ELSE TRUE END has_fitbit_plus_device, CASE WHEN ws.person_id IS NULL THEN FALSE ELSE TRUE END has_wear_consent, CASE WHEN ehr.person_id IS NULL THEN FALSE ELSE TRUE END has_ehr_data, CASE WHEN pm.person_id IS NULL THEN FALSE ELSE TRUE END has_pm_data, + CASE + WHEN pregnant.person_id IS NULL THEN FALSE ELSE TRUE END has_pregnant_at_enrollment, + CASE + WHEN wheelchair.person_id IS NULL THEN FALSE ELSE TRUE END has_wheelchair_at_enrollment, CASE WHEN d.death_date is null THEN FALSE ELSE TRUE END is_deceased FROM `${omopDataset}.person` p @@ -73,6 +82,7 @@ LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.heart_rate_summary`) h LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.steps_intraday`) si ON (p.person_id = si.person_id) LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.sleep_daily_summary`) sds ON (p.person_id = sds.person_id) LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.sleep_level`) sl ON (p.person_id = sl.person_id) +LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.device`) dev ON (p.person_id = dev.person_id) LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.wear_study`) ws ON (p.person_id = ws.person_id) LEFT JOIN (SELECT DISTINCT person_id FROM`${omopDataset}.measurement` as a LEFT JOIN`${omopDataset}.measurement_ext` as b on a.measurement_id = b.measurement_id @@ -110,5 +120,13 @@ LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.measurement` AND domain_id = 'Measurement' ) ) pm ON (p.person_id = pm.person_id) +LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.observation` + WHERE observation_source_concept_id = 903120 + AND value_as_concept_id = 45877994 +) pregnant ON (p.person_id = pregnant.person_id) +LEFT JOIN (SELECT DISTINCT person_id FROM `${omopDataset}.measurement` + WHERE measurement_source_concept_id = 903111 + AND value_as_concept_id = 4023190 +) wheelchair ON (p.person_id = wheelchair.person_id) LEFT JOIN (SELECT person_id, max(death_date) as death_date FROM `${omopDataset}.death` GROUP BY person_id) d ON (p.person_id = d.person_id) diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/person/entity.json b/underlay/src/main/resources/config/datamapping/aouRT/entity/person/entity.json index 4dcef8242..cc722623e 100644 --- a/underlay/src/main/resources/config/datamapping/aouRT/entity/person/entity.json +++ b/underlay/src/main/resources/config/datamapping/aouRT/entity/person/entity.json @@ -57,9 +57,13 @@ { "name": "has_fitbit_sleep_daily_summary", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_fitbit_sleep_level", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_fitbit", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_fitbit_device", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_fitbit_plus_device", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_wear_consent", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_ehr_data", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "has_pm_data", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_pregnant_at_enrollment", "dataType": "BOOLEAN", "isSuppressedForExport": true }, + { "name": "has_wheelchair_at_enrollment", "dataType": "BOOLEAN", "isSuppressedForExport": true }, { "name": "is_deceased", "dataType": "BOOLEAN", "isSuppressedForExport": true } ], "idAttribute": "id", diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/pregnant/all.sql b/underlay/src/main/resources/config/datamapping/aouRT/entity/pregnant/all.sql deleted file mode 100644 index b4d6b8a2e..000000000 --- a/underlay/src/main/resources/config/datamapping/aouRT/entity/pregnant/all.sql +++ /dev/null @@ -1,26 +0,0 @@ -SELECT - mo.measurement_id, - mo.person_id, - (CASE WHEN mo.measurement_concept_id IS NULL THEN 0 ELSE mo.measurement_concept_id END) AS measurement_concept_id, - mc.concept_name AS measurement_concept_name, - mo.measurement_datetime, - mo.value_as_number, - mo.value_as_concept_id, - evc.concept_name AS value_as_concept_name, - mo.unit_concept_id, - uc.concept_name AS unit_concept_name, - mo.measurement_source_value, - mo.measurement_source_concept_id, - CAST(FLOOR(TIMESTAMP_DIFF(mo.measurement_datetime, p.birth_datetime, DAY) / 365.25) AS INT64) AS age_at_occurrence, - mo.visit_occurrence_id, - vo.visit_concept_id, - vc.concept_name AS visit_concept_name, - true as pregnant_at_enrollment -FROM `${omopDataset}.measurement` AS mo - JOIN `${omopDataset}.person` AS p ON p.person_id = mo.person_id - LEFT JOIN `${omopDataset}.concept` AS mc ON mc.concept_id = mo.measurement_concept_id - LEFT JOIN `${omopDataset}.concept` AS evc ON evc.concept_id = mo.value_as_concept_id - LEFT JOIN `${omopDataset}.concept` AS uc ON uc.concept_id = mo.unit_concept_id - LEFT JOIN `${omopDataset}.visit_occurrence` AS vo ON vo.visit_occurrence_id = mo.visit_occurrence_id - LEFT JOIN `${omopDataset}.concept` AS vc ON vc.concept_id = vo.visit_concept_id -WHERE mo.measurement_source_concept_id = 903120 diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/pregnant/entity.json b/underlay/src/main/resources/config/datamapping/aouRT/entity/pregnant/entity.json deleted file mode 100644 index 6ebe2ae67..000000000 --- a/underlay/src/main/resources/config/datamapping/aouRT/entity/pregnant/entity.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "pregnant", - "allInstancesSqlFile": "all.sql", - "attributes": [ - { "name": "id", "dataType": "INT64", "valueFieldName": "measurement_id" }, - { "name": "person_id", "dataType": "INT64" }, - { "name": "measurement", "dataType": "INT64", "valueFieldName": "measurement_concept_id", "displayFieldName": "measurement_concept_name" }, - { "name": "date", "dataType": "TIMESTAMP", "valueFieldName": "measurement_datetime" }, - { "name": "value_numeric", "dataType": "DOUBLE", "valueFieldName": "value_as_number", "isComputeDisplayHint": true, "displayHintRangeMin": 0, "displayHintRangeMax": 100 }, - { "name": "value_enum", "dataType": "INT64", "valueFieldName": "value_as_concept_id", "displayFieldName": "value_as_concept_name" }, - { "name": "unit", "dataType": "INT64", "valueFieldName": "unit_concept_id", "displayFieldName": "unit_concept_name" }, - { "name": "source_value", "dataType": "STRING", "valueFieldName": "measurement_source_value" }, - { "name": "source_criteria_id", "dataType": "INT64", "valueFieldName": "measurement_source_concept_id" }, - { "name": "age_at_occurrence", "dataType": "INT64", "isComputeDisplayHint": true }, - { "name": "visit_occurrence_id", "dataType": "INT64" }, - { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true }, - { "name": "pregnant_at_enrollment", "dataType": "BOOLEAN", "isSuppressedForExport": true } - ], - "idAttribute": "id" -} diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/wearableDevice/all.sql b/underlay/src/main/resources/config/datamapping/aouRT/entity/wearableDevice/all.sql new file mode 100644 index 000000000..266c7152c --- /dev/null +++ b/underlay/src/main/resources/config/datamapping/aouRT/entity/wearableDevice/all.sql @@ -0,0 +1,12 @@ +SELECT + row_id, + person_id, + device_id, + device_date, + battery, + battery_level, + device_version, + device_type, + TIMESTAMP(last_sync_time) AS last_sync_time, + src_id +FROM `${omopDataset}.device` diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/wearableDevice/entity.json b/underlay/src/main/resources/config/datamapping/aouRT/entity/wearableDevice/entity.json new file mode 100644 index 000000000..a08abaeb8 --- /dev/null +++ b/underlay/src/main/resources/config/datamapping/aouRT/entity/wearableDevice/entity.json @@ -0,0 +1,18 @@ +{ + "name": "wearableDevice", + "allInstancesSqlFile": "all.sql", + "attributes": [ + { "name": "id", "dataType": "INT64", "valueFieldName": "row_id", "isSuppressedForExport": true }, + { "name": "person_id", "dataType": "INT64" }, + { "name": "device_id", "dataType": "STRING" }, + { "name": "device_date", "dataType": "DATE" }, + { "name": "battery", "dataType": "STRING" }, + { "name": "battery_level", "dataType": "STRING" }, + { "name": "device_version", "dataType": "STRING" }, + { "name": "device_type", "dataType": "STRING" }, + { "name": "last_sync_time", "dataType": "TIMESTAMP" }, + { "name": "src_id", "dataType": "STRING" } + ], + "idAttribute": "id", + "sourceQueryTableName": "${omopDataset}.device" +} diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/wheelchair/all.sql b/underlay/src/main/resources/config/datamapping/aouRT/entity/wheelchair/all.sql deleted file mode 100644 index 286b09c0e..000000000 --- a/underlay/src/main/resources/config/datamapping/aouRT/entity/wheelchair/all.sql +++ /dev/null @@ -1,26 +0,0 @@ -SELECT - mo.measurement_id, - mo.person_id, - (CASE WHEN mo.measurement_concept_id IS NULL THEN 0 ELSE mo.measurement_concept_id END) AS measurement_concept_id, - mc.concept_name AS measurement_concept_name, - mo.measurement_datetime, - mo.value_as_number, - mo.value_as_concept_id, - evc.concept_name AS value_as_concept_name, - mo.unit_concept_id, - uc.concept_name AS unit_concept_name, - mo.measurement_source_value, - mo.measurement_source_concept_id, - CAST(FLOOR(TIMESTAMP_DIFF(mo.measurement_datetime, p.birth_datetime, DAY) / 365.25) AS INT64) AS age_at_occurrence, - mo.visit_occurrence_id, - vo.visit_concept_id, - vc.concept_name AS visit_concept_name, - true as wheelchair_at_enrollment -FROM `${omopDataset}.measurement` AS mo - JOIN `${omopDataset}.person` AS p ON p.person_id = mo.person_id - LEFT JOIN `${omopDataset}.concept` AS mc ON mc.concept_id = mo.measurement_concept_id - LEFT JOIN `${omopDataset}.concept` AS evc ON evc.concept_id = mo.value_as_concept_id - LEFT JOIN `${omopDataset}.concept` AS uc ON uc.concept_id = mo.unit_concept_id - LEFT JOIN `${omopDataset}.visit_occurrence` AS vo ON vo.visit_occurrence_id = mo.visit_occurrence_id - LEFT JOIN `${omopDataset}.concept` AS vc ON vc.concept_id = vo.visit_concept_id -WHERE mo.measurement_source_concept_id = 903111 diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entity/wheelchair/entity.json b/underlay/src/main/resources/config/datamapping/aouRT/entity/wheelchair/entity.json deleted file mode 100644 index 1b7c63fcb..000000000 --- a/underlay/src/main/resources/config/datamapping/aouRT/entity/wheelchair/entity.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "wheelchair", - "allInstancesSqlFile": "all.sql", - "attributes": [ - { "name": "id", "dataType": "INT64", "valueFieldName": "measurement_id" }, - { "name": "person_id", "dataType": "INT64" }, - { "name": "measurement", "dataType": "INT64", "valueFieldName": "measurement_concept_id", "displayFieldName": "measurement_concept_name" }, - { "name": "date", "dataType": "TIMESTAMP", "valueFieldName": "measurement_datetime" }, - { "name": "value_numeric", "dataType": "DOUBLE", "valueFieldName": "value_as_number", "isComputeDisplayHint": true, "displayHintRangeMin": 0, "displayHintRangeMax": 100 }, - { "name": "value_enum", "dataType": "INT64", "valueFieldName": "value_as_concept_id", "displayFieldName": "value_as_concept_name" }, - { "name": "unit", "dataType": "INT64", "valueFieldName": "unit_concept_id", "displayFieldName": "unit_concept_name" }, - { "name": "source_value", "dataType": "STRING", "valueFieldName": "measurement_source_value" }, - { "name": "source_criteria_id", "dataType": "INT64", "valueFieldName": "measurement_source_concept_id" }, - { "name": "age_at_occurrence", "dataType": "INT64", "isComputeDisplayHint": true }, - { "name": "visit_occurrence_id", "dataType": "INT64" }, - { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true }, - { "name": "wheelchair_at_enrollment", "dataType": "BOOLEAN", "isSuppressedForExport": true } - ], - "idAttribute": "id" -} diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entitygroup/pregnantPerson/entityGroup.json b/underlay/src/main/resources/config/datamapping/aouRT/entitygroup/wearableDevicePerson/entityGroup.json similarity index 53% rename from underlay/src/main/resources/config/datamapping/aouRT/entitygroup/pregnantPerson/entityGroup.json rename to underlay/src/main/resources/config/datamapping/aouRT/entitygroup/wearableDevicePerson/entityGroup.json index 7ba54a7e0..be3ac82a4 100644 --- a/underlay/src/main/resources/config/datamapping/aouRT/entitygroup/pregnantPerson/entityGroup.json +++ b/underlay/src/main/resources/config/datamapping/aouRT/entitygroup/wearableDevicePerson/entityGroup.json @@ -1,6 +1,6 @@ { - "name": "pregnantPerson", + "name": "wearableDevicePerson", "groupEntity": "person", - "itemsEntity": "pregnant", + "itemsEntity": "wearableDevice", "foreignKeyAttributeItemsEntity": "person_id" } diff --git a/underlay/src/main/resources/config/datamapping/aouRT/entitygroup/wheelchairPerson/entityGroup.json b/underlay/src/main/resources/config/datamapping/aouRT/entitygroup/wheelchairPerson/entityGroup.json deleted file mode 100644 index 0d22ec706..000000000 --- a/underlay/src/main/resources/config/datamapping/aouRT/entitygroup/wheelchairPerson/entityGroup.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "wheelchairPerson", - "groupEntity": "person", - "itemsEntity": "wheelchair", - "foreignKeyAttributeItemsEntity": "person_id" -} diff --git a/underlay/src/main/resources/config/underlay/aouC2024Q3R4/underlay.json b/underlay/src/main/resources/config/underlay/aouC2024Q3R4/underlay.json index 7f43f1bed..efb1ceb05 100644 --- a/underlay/src/main/resources/config/underlay/aouC2024Q3R4/underlay.json +++ b/underlay/src/main/resources/config/underlay/aouC2024Q3R4/underlay.json @@ -40,6 +40,7 @@ "aouRT/sleepDailySummary", "aouRT/sleepLevel", "aouRT/stepsIntraday", + "aouRT/wearableDevice", "aouCT/zipcodeSocioeconomic", "aouRT/bloodPressure", @@ -49,8 +50,6 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", - "aouRT/pregnant", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -71,6 +70,7 @@ "aouRT/sleepDailySummaryPerson", "aouRT/sleepLevelPerson", "aouRT/stepsIntradayPerson", + "aouRT/wearableDevicePerson", "aouCT/zipcodeSocioeconomicPerson", "aouRT/bloodPressurePerson", @@ -79,9 +79,7 @@ "aouRT/weightPerson", "aouRT/bmiPerson", "aouRT/waistCircumferencePerson", - "aouRT/hipCircumferencePerson", - "aouRT/wheelchairPerson", - "aouRT/pregnantPerson" + "aouRT/hipCircumferencePerson" ], "criteriaOccurrenceEntityGroups": [ "aouRT/conditionPerson", @@ -135,8 +133,8 @@ "aouRT/ethnicity", "aouRT/gender", "aouRT/race", - "aouRT/selfReportedCategory", "aouRT/sexAtBirth", + "aouRT/selfReportedCategory", "aouRT/fitbit", "aouRT/fitbitActivitySummary", "aouRT/fitbitStepsIntraday", @@ -144,6 +142,9 @@ "aouRT/fitbitHeartRateSummary", "aouRT/fitbitSleepDailySummary", "aouRT/fitbitSleepLevel", + "aouRT/fitbitPlusDevice", + "aouRT/fitbitDevice", + "aouRT/wearConsent", "aouCT/shortReadWGS", "aouCT/longReadWGS", "aouCT/globalDiversityArray", @@ -156,8 +157,8 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", "aouRT/pregnant", + "aouRT/wheelchair", "aouRT/outputUnfiltered", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -170,13 +171,15 @@ ], "prepackagedDataFeatures": [ "aouRT/_demographics", - "aouRT/_fitbit_actvity_summary_id", + "aouRT/_fitbit_activity_summary_id", "aouRT/_fitbit_steps_intraday_id", "aouRT/_fitbit_heart_rate_summary_id", "aouRT/_fitbit_heart_rate_level_id", "aouRT/_fitbit_sleep_daily_summary_id", "aouRT/_fitbit_sleep_level_id", - "aouCT/_zipcode_socioeconomic_id" + "aouRT/_fitbit_device_id", + "aouCT/_zipcode_socioeconomic_id", + "aouCT/_short_read_wgs" ], "visualizations": [ "omop/genderAndAge", diff --git a/underlay/src/main/resources/config/underlay/aouR2024Q3R4/underlay.json b/underlay/src/main/resources/config/underlay/aouR2024Q3R4/underlay.json index 04f62d23b..36df7ed87 100644 --- a/underlay/src/main/resources/config/underlay/aouR2024Q3R4/underlay.json +++ b/underlay/src/main/resources/config/underlay/aouR2024Q3R4/underlay.json @@ -40,6 +40,7 @@ "aouRT/sleepDailySummary", "aouRT/sleepLevel", "aouRT/stepsIntraday", + "aouRT/wearableDevice", "aouRT/bloodPressure", "aouRT/heartRate", @@ -48,8 +49,6 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", - "aouRT/pregnant", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -70,6 +69,7 @@ "aouRT/sleepDailySummaryPerson", "aouRT/sleepLevelPerson", "aouRT/stepsIntradayPerson", + "aouRT/wearableDevicePerson", "aouRT/bloodPressurePerson", "aouRT/heartRatePerson", @@ -77,9 +77,7 @@ "aouRT/weightPerson", "aouRT/bmiPerson", "aouRT/waistCircumferencePerson", - "aouRT/hipCircumferencePerson", - "aouRT/wheelchairPerson", - "aouRT/pregnantPerson" + "aouRT/hipCircumferencePerson" ], "criteriaOccurrenceEntityGroups": [ "aouRT/conditionPerson", @@ -133,8 +131,8 @@ "aouRT/ethnicity", "aouRT/gender", "aouRT/race", - "aouRT/selfReportedCategory", "aouRT/sexAtBirth", + "aouRT/selfReportedCategory", "aouRT/fitbit", "aouRT/fitbitActivitySummary", "aouRT/fitbitStepsIntraday", @@ -142,6 +140,9 @@ "aouRT/fitbitHeartRateSummary", "aouRT/fitbitSleepDailySummary", "aouRT/fitbitSleepLevel", + "aouRT/fitbitPlusDevice", + "aouRT/fitbitDevice", + "aouRT/wearConsent", "aouRT/hasPMData", "aouRT/bloodPressure", "aouRT/heartRate", @@ -150,8 +151,8 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", "aouRT/pregnant", + "aouRT/wheelchair", "aouRT/outputUnfiltered", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -164,12 +165,13 @@ ], "prepackagedDataFeatures": [ "aouRT/_demographics", - "aouRT/_fitbit_actvity_summary_id", + "aouRT/_fitbit_activity_summary_id", "aouRT/_fitbit_steps_intraday_id", "aouRT/_fitbit_heart_rate_summary_id", "aouRT/_fitbit_heart_rate_level_id", "aouRT/_fitbit_sleep_daily_summary_id", - "aouRT/_fitbit_sleep_level_id" + "aouRT/_fitbit_sleep_level_id", + "aouRT/_fitbit_device_id" ], "visualizations": [ "omop/genderAndAge", diff --git a/underlay/src/main/resources/config/underlay/aouSC2023Q3R2/underlay.json b/underlay/src/main/resources/config/underlay/aouSC2023Q3R2/underlay.json index efb89cc99..2fe1ee8c2 100644 --- a/underlay/src/main/resources/config/underlay/aouSC2023Q3R2/underlay.json +++ b/underlay/src/main/resources/config/underlay/aouSC2023Q3R2/underlay.json @@ -40,6 +40,7 @@ "aouRT/sleepDailySummary", "aouRT/sleepLevel", "aouRT/stepsIntraday", + "aouRT/wearableDevice", "aouCT/zipcodeSocioeconomic", "aouRT/bloodPressure", @@ -49,8 +50,6 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", - "aouRT/pregnant", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -71,6 +70,7 @@ "aouRT/sleepDailySummaryPerson", "aouRT/sleepLevelPerson", "aouRT/stepsIntradayPerson", + "aouRT/wearableDevicePerson", "aouCT/zipcodeSocioeconomicPerson", "aouRT/bloodPressurePerson", @@ -79,9 +79,7 @@ "aouRT/weightPerson", "aouRT/bmiPerson", "aouRT/waistCircumferencePerson", - "aouRT/hipCircumferencePerson", - "aouRT/wheelchairPerson", - "aouRT/pregnantPerson" + "aouRT/hipCircumferencePerson" ], "criteriaOccurrenceEntityGroups": [ "aouRT/conditionPerson", @@ -135,8 +133,8 @@ "aouRT/ethnicity", "aouRT/gender", "aouRT/race", - "aouRT/selfReportedCategory", "aouRT/sexAtBirth", + "aouRT/selfReportedCategory", "aouRT/fitbit", "aouRT/fitbitActivitySummary", "aouRT/fitbitStepsIntraday", @@ -144,6 +142,8 @@ "aouRT/fitbitHeartRateSummary", "aouRT/fitbitSleepDailySummary", "aouRT/fitbitSleepLevel", + "aouRT/fitbitPlusDevice", + "aouRT/fitbitDevice", "aouRT/wearConsent", "aouCT/shortReadWGS", "aouCT/longReadWGS", @@ -157,8 +157,8 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", "aouRT/pregnant", + "aouRT/wheelchair", "aouRT/outputUnfiltered", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -171,12 +171,13 @@ ], "prepackagedDataFeatures": [ "aouRT/_demographics", - "aouRT/_fitbit_actvity_summary_id", + "aouRT/_fitbit_activity_summary_id", "aouRT/_fitbit_steps_intraday_id", "aouRT/_fitbit_heart_rate_summary_id", "aouRT/_fitbit_heart_rate_level_id", "aouRT/_fitbit_sleep_daily_summary_id", "aouRT/_fitbit_sleep_level_id", + "aouRT/_fitbit_device_id", "aouCT/_zipcode_socioeconomic_id", "aouCT/_short_read_wgs" ], diff --git a/underlay/src/main/resources/config/underlay/aouSC2023Q3R2_testonly/underlay.json b/underlay/src/main/resources/config/underlay/aouSC2023Q3R2_testonly/underlay.json index df929b8cb..56568c2c9 100644 --- a/underlay/src/main/resources/config/underlay/aouSC2023Q3R2_testonly/underlay.json +++ b/underlay/src/main/resources/config/underlay/aouSC2023Q3R2_testonly/underlay.json @@ -162,7 +162,7 @@ ], "prepackagedDataFeatures": [ "aouRT/_demographics", - "aouRT/_fitbit_actvity_summary_id", + "aouRT/_fitbit_activity_summary_id", "aouRT/_fitbit_steps_intraday_id", "aouRT/_fitbit_heart_rate_summary_id", "aouRT/_fitbit_heart_rate_level_id", diff --git a/underlay/src/main/resources/config/underlay/aouSR2023Q3R2/underlay.json b/underlay/src/main/resources/config/underlay/aouSR2023Q3R2/underlay.json index 699555548..96da40ef4 100644 --- a/underlay/src/main/resources/config/underlay/aouSR2023Q3R2/underlay.json +++ b/underlay/src/main/resources/config/underlay/aouSR2023Q3R2/underlay.json @@ -40,6 +40,7 @@ "aouRT/sleepDailySummary", "aouRT/sleepLevel", "aouRT/stepsIntraday", + "aouRT/wearableDevice", "aouRT/bloodPressure", "aouRT/heartRate", @@ -48,8 +49,6 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", - "aouRT/pregnant", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -70,6 +69,7 @@ "aouRT/sleepDailySummaryPerson", "aouRT/sleepLevelPerson", "aouRT/stepsIntradayPerson", + "aouRT/wearableDevicePerson", "aouRT/bloodPressurePerson", "aouRT/heartRatePerson", @@ -77,9 +77,7 @@ "aouRT/weightPerson", "aouRT/bmiPerson", "aouRT/waistCircumferencePerson", - "aouRT/hipCircumferencePerson", - "aouRT/wheelchairPerson", - "aouRT/pregnantPerson" + "aouRT/hipCircumferencePerson" ], "criteriaOccurrenceEntityGroups": [ "aouRT/conditionPerson", @@ -133,8 +131,8 @@ "aouRT/ethnicity", "aouRT/gender", "aouRT/race", - "aouRT/selfReportedCategory", "aouRT/sexAtBirth", + "aouRT/selfReportedCategory", "aouRT/fitbit", "aouRT/fitbitActivitySummary", "aouRT/fitbitStepsIntraday", @@ -142,6 +140,8 @@ "aouRT/fitbitHeartRateSummary", "aouRT/fitbitSleepDailySummary", "aouRT/fitbitSleepLevel", + "aouRT/fitbitPlusDevice", + "aouRT/fitbitDevice", "aouRT/wearConsent", "aouRT/hasPMData", "aouRT/bloodPressure", @@ -151,8 +151,8 @@ "aouRT/bmi", "aouRT/waistCircumference", "aouRT/hipCircumference", - "aouRT/wheelchair", "aouRT/pregnant", + "aouRT/wheelchair", "aouRT/outputUnfiltered", "aouRT/surveyBasics", "aouRT/surveyLifestyle", @@ -165,12 +165,13 @@ ], "prepackagedDataFeatures": [ "aouRT/_demographics", - "aouRT/_fitbit_actvity_summary_id", + "aouRT/_fitbit_activity_summary_id", "aouRT/_fitbit_steps_intraday_id", "aouRT/_fitbit_heart_rate_summary_id", "aouRT/_fitbit_heart_rate_level_id", "aouRT/_fitbit_sleep_daily_summary_id", - "aouRT/_fitbit_sleep_level_id" + "aouRT/_fitbit_sleep_level_id", + "aouRT/_fitbit_device_id" ], "visualizations": [ "omop/genderAndAge",