SORMAS-Foundation#2957 Campaign chart calculation based on fieldValue not working correct

Author: Martin Wahnschaffe

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/data/CampaignFormDataFacadeEjb.java

@@ -309,14 +309,15 @@ public List<CampaignDiagramDataDto> getDiagramData(
 					region != null ? ", " + District.TABLE_NAME + "." + District.UUID + ", " + District.TABLE_NAME + "." + District.NAME : "")
 							+ ", " + Region.TABLE_NAME + "." + Region.UUID + ", " + Region.TABLE_NAME + "." + Region.NAME;
 
+			
 			Query seriesDataQuery = em.createNativeQuery(
 					"SELECT " + CampaignFormMeta.TABLE_NAME + "." + CampaignFormMeta.UUID  + " as formUuid,"
 							+ CampaignFormMeta.TABLE_NAME + "." + CampaignFormMeta.FORM_ID + " as formId"
 							+ ", jsonData->>'" + CampaignFormDataEntry.ID + "' as fieldId"
 							+ ", jsonMeta->>'" + CampaignFormElement.CAPTION + "' as fieldCaption"
 							+ ", CASE"
 							+ " WHEN (jsonMeta ->> '" + CampaignFormElement.TYPE + "')  = '" + CampaignFormElementType.NUMBER.toString() + "' THEN sum(cast_to_int(jsonData->>'" + CampaignFormDataEntry.VALUE + "', 0))"
-							+ " ELSE count((jsonData->>'" + CampaignFormDataEntry.VALUE + "') = '" + diagramSeries.getFieldValue() + "')"
+							+ " ELSE sum(CASE WHEN(jsonData->>'" + CampaignFormDataEntry.VALUE + "') = '" + diagramSeries.getFieldValue() + "' THEN 1 ELSE 0 END)"
 		      				+ " END as sumValue"
 							+ ", " + Region.TABLE_NAME + "." + Region.UUID
 							+ ", " + Region.TABLE_NAME + "." + Region.NAME