From ef2dabfbc8c6a0cde8d79f30bddb5f62c1dea6c2 Mon Sep 17 00:00:00 2001
From: Will Dolbeer <40036095+dolbeew@users.noreply.github.com>
Date: Tue, 25 Feb 2025 10:51:15 -0500
Subject: [PATCH] Fix BP export for SD underlay (#1180)

---
 .../datamapping/sd/entity/bloodPressure/all.sql      |  2 +-
 .../datamapping/sd/entity/bloodPressure/entity.json  | 12 +++++++++---
 .../resources/config/service/sd/sd_20240831_dev.json |  1 +
 .../config/service/sd/sd_20240831_prod.json          |  1 +
 .../config/service/sd/sd_20240831_test.json          |  1 +
 .../main/resources/config/service/sd/sd_local.json   |  7 ++++---
 6 files changed, 17 insertions(+), 7 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
index 3130d3436..787278557 100644
--- 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 row_id,
+  ROW_NUMBER() OVER (ORDER BY xbp.person_id, xbp.measurement_datetime) AS 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
index cef88bfae..6c4868982 100644
--- 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,10 +2,16 @@
   "name": "bloodPressure",
   "allInstancesSqlFile": "all.sql",
   "attributes": [
-    { "name": "id", "dataType": "INT64", "valueFieldName": "row_id", "isSuppressedForExport": true },
+    { "name": "id", "dataType": "INT64", "isSuppressedForExport": true },
     { "name": "person_id", "dataType": "INT64" },
     { "name": "GRID", "dataType": "STRING", "valueFieldName": "person_source_value", "isSuppressedForExport": true },
-    { "name": "date", "dataType": "TIMESTAMP", "valueFieldName": "measurement_datetime" },
+    { "name": "date", "dataType": "TIMESTAMP", "valueFieldName": "person_id",
+      "sourceQuery": {
+        "displayFieldName": "measurement_datetime",
+        "displayFieldTable": "${omopDataset}.x_blood_pressure",
+        "displayFieldTableJoinFieldName": "person_id"
+      }
+    },
     { "name": "systolic", "dataType": "INT64", "isComputeDisplayHint": true },
     { "name": "diastolic", "dataType": "INT64", "isComputeDisplayHint": true },
     { "name": "bp", "dataType": "STRING" },
@@ -15,5 +21,5 @@
     { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true, "isSuppressedForExport": true }
   ],
   "idAttribute": "id",
-  "sourceQueryTableName": "${omopDataset}.x_blood_pressure"
+  "sourceQueryTableName": "${indexedDataset}.ENT_bloodPressure"
 }
diff --git a/underlay/src/main/resources/config/service/sd/sd_20240831_dev.json b/underlay/src/main/resources/config/service/sd/sd_20240831_dev.json
index f0a80ad62..b7645656d 100644
--- a/underlay/src/main/resources/config/service/sd/sd_20240831_dev.json
+++ b/underlay/src/main/resources/config/service/sd/sd_20240831_dev.json
@@ -5,6 +5,7 @@
       "projectId": "vumc-sd-dev",
       "datasetId": "sd_20240831",
       "sqlSubstitutions": {
+        "indexedDataset": "vumc-sd-dev.indexed_sd_20240831",
         "omopDataset": "vumc-sd-dev.sd_20240831",
         "staticTablesDataset": "vumc-sd-dev.sd_20240831"
       }
diff --git a/underlay/src/main/resources/config/service/sd/sd_20240831_prod.json b/underlay/src/main/resources/config/service/sd/sd_20240831_prod.json
index 5dcf20d05..d163f93d9 100644
--- a/underlay/src/main/resources/config/service/sd/sd_20240831_prod.json
+++ b/underlay/src/main/resources/config/service/sd/sd_20240831_prod.json
@@ -5,6 +5,7 @@
       "projectId": "vumc-sd-prod",
       "datasetId": "sd_20240831",
       "sqlSubstitutions": {
+        "indexedDataset": "vumc-sd-prod.indexed_sd_20240831",
         "omopDataset": "vumc-sd-prod.sd_20240831",
         "staticTablesDataset": "vumc-sd-prod.sd_20240831"
       }
diff --git a/underlay/src/main/resources/config/service/sd/sd_20240831_test.json b/underlay/src/main/resources/config/service/sd/sd_20240831_test.json
index 4e474aa68..53afa2733 100644
--- a/underlay/src/main/resources/config/service/sd/sd_20240831_test.json
+++ b/underlay/src/main/resources/config/service/sd/sd_20240831_test.json
@@ -5,6 +5,7 @@
       "projectId": "vumc-sd-test",
       "datasetId": "sd_20240831",
       "sqlSubstitutions": {
+        "indexedDataset": "vumc-sd-test.indexed_sd_20240831",
         "omopDataset": "vumc-sd-test.sd_20240831",
         "staticTablesDataset": "vumc-sd-test.sd_20240831"
       }
diff --git a/underlay/src/main/resources/config/service/sd/sd_local.json b/underlay/src/main/resources/config/service/sd/sd_local.json
index 04b4d205b..f3b7398d3 100644
--- a/underlay/src/main/resources/config/service/sd/sd_local.json
+++ b/underlay/src/main/resources/config/service/sd/sd_local.json
@@ -5,15 +5,16 @@
       "projectId": "vumc-sd-dev",
       "datasetId": "sd_20240831",
       "sqlSubstitutions": {
-        "omopDataset": "vumc-sd-test.sd_20240831",
-        "staticTablesDataset": "vumc-sd-test.sd_20240831"
+        "indexedDataset": "vumc-sd-dev.indexed_sd_20240831_2",
+        "omopDataset": "vumc-sd-dev.sd_20240831",
+        "staticTablesDataset": "vumc-sd-dev.sd_20240831"
       }
     },
     "indexData": {
       "projectId": "vumc-sd-dev",
       "datasetId": "indexed_sd_20240831_2"
     },
-    "queryProjectId": "vumc-sd-test",
+    "queryProjectId": "vumc-sd-dev",
     "dataLocation": "us-central1"
   },
   "uiConfigFile": "ui.json"