Fixes for SD exports (#1141)

* filter suppressed attributes for export * update visit attribute for condition * update filter condition
DataBiosphere · Jan 24, 2025 · 3a7ab75 · 3a7ab75
1 parent c5c8cc8
commit 3a7ab75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/service/src/main/java/bio/terra/tanagra/service/export/DataExportHelper.java b/service/src/main/java/bio/terra/tanagra/service/export/DataExportHelper.java
@@ -116,7 +116,9 @@ public String generateSqlForPrimaryEntity(
     List<ValueDisplayField> selectedAttributeFields = new ArrayList<>();
     exportRequest.getUnderlay().getPrimaryEntity().getAttributes().stream()
         .filter(
-            attribute -> attributeNames.isEmpty() || attributeNames.contains(attribute.getName()))
+            attribute ->
+                (attributeNames.isEmpty() || attributeNames.contains(attribute.getName()))
+                    && !attribute.isSuppressedForExport())
         .forEach(
             attribute ->
                 selectedAttributeFields.add(

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
@@ -28,8 +28,8 @@
     { "name": "visit_type", "dataType": "INT64", "valueFieldName": "visit_concept_id", "displayFieldName": "visit_concept_name", "isComputeDisplayHint": true,
       "sourceQuery": {
         "displayFieldName": "concept_name",
-        "displayFieldTable": "${omopDataset}.concept",
-        "displayFieldTableJoinFieldName": "concept_id"
+        "displayFieldTable": "${omopDataset}.visit_occurrence",
+        "displayFieldTableJoinFieldName": "visit_occurrence_id"
       }
     }
   ],