update existing export entities

DataBiosphere · Jan 27, 2025 · 236dc90 · 236dc90
1 parent 352e229
commit 236dc90
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/underlay/src/main/resources/config/datamapping/sd/entity/bloodPressure/all.sql b/underlay/src/main/resources/config/datamapping/sd/entity/bloodPressure/all.sql
@@ -1,5 +1,5 @@
 SELECT
-  ROW_NUMBER() OVER (ORDER BY xbp.person_id, xbp.measurement_datetime) AS id,
+  ROW_NUMBER() OVER (ORDER BY xbp.person_id, xbp.measurement_datetime) AS row_id,
   xbp.person_id,
   p.person_source_value,
   xbp.measurement_datetime,

diff --git a/underlay/src/main/resources/config/datamapping/sd/entity/bloodPressure/entity.json b/underlay/src/main/resources/config/datamapping/sd/entity/bloodPressure/entity.json
@@ -2,7 +2,7 @@
   "name": "bloodPressure",
   "allInstancesSqlFile": "all.sql",
   "attributes": [
-    { "name": "id", "dataType": "INT64", "isSuppressedForExport": true },
+    { "name": "id", "dataType": "INT64", "valueFieldName": "row_id", "isSuppressedForExport": true },
     { "name": "person_id", "dataType": "INT64" },
     { "name": "GRID", "dataType": "STRING", "valueFieldName": "person_source_value", "isSuppressedForExport": true },
     { "name": "date", "dataType": "TIMESTAMP", "valueFieldName": "measurement_datetime" },

diff --git a/underlay/src/main/resources/config/datamapping/sd/entity/bmi/entity.json b/underlay/src/main/resources/config/datamapping/sd/entity/bmi/entity.json
@@ -5,7 +5,7 @@
     { "name": "id", "dataType": "INT64", "valueFieldName": "measurement_id", "isSuppressedForExport": true },
     { "name": "person_id", "dataType": "INT64" },
     { "name": "GRID", "dataType": "STRING", "valueFieldName": "person_source_value", "isSuppressedForExport": true },
-    { "name": "is_clean", "dataType": "INT64", "displayFieldName": "is_clean_name", "isComputeDisplayHint": true },
+    { "name": "is_clean", "dataType": "INT64", "displayFieldName": "is_clean_name", "isComputeDisplayHint": true, "isSuppressedForExport": true },
     { "name": "date", "dataType": "TIMESTAMP", "valueFieldName": "measurement_date" },
     { "name": "value_numeric", "dataType": "DOUBLE", "valueFieldName": "value_as_number", "isComputeDisplayHint": true, "displayHintRangeMin": 5, "displayHintRangeMax": 95 },
     { "name": "value_enum", "dataType": "INT64", "valueFieldName": "value_as_concept_id", "displayFieldName": "value_as_concept_name", "isComputeDisplayHint": true,

diff --git a/underlay/src/main/resources/config/datamapping/sd/entity/conditionOccurrence/entity.json b/underlay/src/main/resources/config/datamapping/sd/entity/conditionOccurrence/entity.json
@@ -25,13 +25,7 @@
     { "name": "source_criteria_id", "dataType": "INT64", "valueFieldName": "condition_source_concept_id" },
     { "name": "age_at_occurrence", "dataType": "INT64", "isComputeDisplayHint": true, "displayHintRangeMin": 0, "displayHintRangeMax": 89, "isSuppressedForExport": true },
     { "name": "visit_occurrence_id", "dataType": "INT64", "isSuppressedForExport": true },
-    { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true,
-      "sourceQuery": {
-        "displayFieldName": "concept_name",
-        "displayFieldTable": "${omopDataset}.visit_occurrence",
-        "displayFieldTableJoinFieldName": "visit_occurrence_id"
-      }
-    }
+    { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true, "isSuppressedForExport": true }
   ],
   "idAttribute": "id",
   "temporalQuery": {

diff --git a/underlay/src/main/resources/config/datamapping/sd/entity/ingredientOccurrence/entity.json b/underlay/src/main/resources/config/datamapping/sd/entity/ingredientOccurrence/entity.json
@@ -21,7 +21,7 @@
     { "name": "source_criteria_id", "dataType": "INT64", "valueFieldName": "drug_source_concept_id" },
     { "name": "age_at_occurrence", "dataType": "INT64", "isComputeDisplayHint": true, "displayHintRangeMin": 0, "displayHintRangeMax": 89, "isSuppressedForExport": true },
     { "name": "visit_occurrence_id", "dataType": "INT64" },
-    { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true },
+    { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true, "isSuppressedForExport": true },
     {"name":  "exposure_type", "dataType":  "INT64", "valueFieldName":  "drug_type_concept_id", "displayFieldName":  "drug_type_concept_name"},
     {"name":  "form", "dataType":  "STRING", "valueFieldName":  "drug_form"},
     {"name":  "strength", "dataType":  "STRING", "valueFieldName":  "drug_strength"},

diff --git a/underlay/src/main/resources/config/datamapping/sd/entity/weight/entity.json b/underlay/src/main/resources/config/datamapping/sd/entity/weight/entity.json
@@ -5,7 +5,7 @@
     { "name": "id", "dataType": "INT64", "valueFieldName": "measurement_id", "isSuppressedForExport": true },
     { "name": "person_id", "dataType": "INT64" },
     { "name": "GRID", "dataType": "STRING", "valueFieldName": "person_source_value", "isSuppressedForExport": true },
-    { "name": "is_clean", "dataType": "INT64", "displayFieldName": "is_clean_name", "isComputeDisplayHint": true },
+    { "name": "is_clean", "dataType": "INT64", "displayFieldName": "is_clean_name", "isComputeDisplayHint": true, "isSuppressedForExport": true },
     { "name": "date", "dataType": "TIMESTAMP", "valueFieldName": "measurement_date" },
     { "name": "value_numeric", "dataType": "DOUBLE", "valueFieldName": "value_as_number", "isComputeDisplayHint": true },
     { "name": "value_enum", "dataType": "INT64", "valueFieldName": "value_as_concept_id", "displayFieldName": "value_as_concept_name", "isComputeDisplayHint": true,