From 3a7ab75ed10b3acdf83b6c584446140a05a53d73 Mon Sep 17 00:00:00 2001 From: Will Dolbeer <40036095+dolbeew@users.noreply.github.com> Date: Fri, 24 Jan 2025 10:38:26 -0500 Subject: [PATCH] Fixes for SD exports (#1141) * filter suppressed attributes for export * update visit attribute for condition * update filter condition --- .../bio/terra/tanagra/service/export/DataExportHelper.java | 4 +++- .../datamapping/sd/entity/conditionOccurrence/entity.json | 4 ++-- 2 files changed, 5 insertions(+), 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 index 379b0ed68..85e89d223 100644 --- 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 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 index bf58e4c9f..5754fbca7 100644 --- 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" } } ],