From 62c2237647ac41076b3a6f1f9b4b6be2b623f4da Mon Sep 17 00:00:00 2001
From: Luciano Fiandesio <luciano@fiandesio.com>
Date: Tue, 7 Jan 2025 10:08:03 +0100
Subject: [PATCH] WIP - fixes after rebase

---
 .../analytics/event/data/JdbcEnrollmentAnalyticsManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java
index a6e63c920f2..5dc97452ee7 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java
@@ -1263,7 +1263,7 @@ private void appendCteClause(StringBuilder sql, CTEContext cteContext)
   private void appendSelectClause(StringBuilder sql, EventQueryParams params, CTEContext cteContext)
   {
     List<String> selectCols = ListUtils.distinctUnion(
-            params.isAggregatedEnrollments() ? List.of("enrollment") : COLUMNS,
+            params.isAggregatedEnrollments() ? List.of("enrollment") : getStandardColumns(),
             getSelectColumnsWithCTE(params, cteContext)
     );