From 092ab3e570149a9c4c4f021659c1aef56fbab265 Mon Sep 17 00:00:00 2001
From: d-bernat <mail@it-bernat.de>
Date: Mon, 23 Dec 2024 11:39:36 +0100
Subject: [PATCH] bugfix unit test

---
 .../org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
index b984df305ea..7889544c140 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java
@@ -1027,8 +1027,11 @@ private Map<String, Object> getKeyValueMap(DataQueryParams params, String sql, i
       } else // NUMERIC
       {
         Double value = rowSet.getDouble(VALUE_ID);
-
-        map.put(key.toString() + counter, value);
+        if (params.hasOptionSetInDimensionItems()) {
+          map.put(key.toString() + counter, value);
+        } else {
+          map.put(key.toString(), value);
+        }
       }
     }