Merge pull request SORMAS-Foundation#2954 from hzi-braunschweig/2944-Error_at_Custom_date_filter_for_current_month_on_Dashboard_contacts-Swiss_only

SORMAS-Foundation#2944 - Error at Custom date filter for current month on Dashboard co…

Author: sergiupacurariu

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/DashboardDataProvider.java

@@ -97,11 +97,7 @@ private void refreshDataForQuarantinedContacts() {
 
 		setContactsInQuarantineCount((long) contactsInQuarantineDtos.size());
 
-		Long dashboardContactsPlacedInQuarantineCount = contactsInQuarantineDtos.stream()
-			.filter(
-				dashboardQuarantineDataDto -> (fromDate.before(DateUtils.addDays(dashboardQuarantineDataDto.getQuarantineFrom(), 1))
-					&& dashboardQuarantineDataDto.getQuarantineFrom().before(toDate)))
-			.count();
+		Long dashboardContactsPlacedInQuarantineCount = getPlacedInQuarantine(contactsInQuarantineDtos);
 
 		setContactsPlacedInQuarantineCount(dashboardContactsPlacedInQuarantineCount);
 	}
@@ -113,13 +109,18 @@ private void refreshDataForQuarantinedCases() {
 
 		setCasesInQuarantineCount((long) casesInQuarantineDtos.size());
 
-		Long dashboardCasesPlacedInQuarantineCount = casesInQuarantineDtos.stream()
+		Long dashboardCasesPlacedInQuarantineCount = getPlacedInQuarantine(casesInQuarantineDtos);
+
+		setCasesPlacedInQuarantineCount(dashboardCasesPlacedInQuarantineCount);
+	}
+
+	private Long getPlacedInQuarantine(List<DashboardQuarantineDataDto> contactsInQuarantineDtos) {
+		return contactsInQuarantineDtos.stream()
 			.filter(
-				dashboardQuarantineDataDto -> (fromDate.before(DateUtils.addDays(dashboardQuarantineDataDto.getQuarantineFrom(), 1))
+				dashboardQuarantineDataDto -> (dashboardQuarantineDataDto.getQuarantineFrom() != null
+					&& fromDate.before(DateUtils.addDays(dashboardQuarantineDataDto.getQuarantineFrom(), 1))
 					&& dashboardQuarantineDataDto.getQuarantineFrom().before(toDate)))
 			.count();
-
-		setCasesPlacedInQuarantineCount(dashboardCasesPlacedInQuarantineCount);
 	}
 
 	private void refreshDataForConvertedContactsToCase() {