SORMAS-Foundation#3488 fix to match latest state of development

Author: FredrikSchäferVitagroup

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageFacadeEjb.java

@@ -26,6 +26,7 @@
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.backend.common.BaseAdoService;
 import de.symeda.sormas.backend.common.ConfigFacadeEjb;
+import de.symeda.sormas.backend.common.CriteriaBuilderHelper;
 import de.symeda.sormas.backend.util.DtoHelper;
 import de.symeda.sormas.backend.util.ModelConstants;
 
@@ -141,7 +142,7 @@ public long count(LabMessageCriteria criteria) {
 
 		if (criteria != null) {
 			Predicate statusFilter = labMessageService.createStatusFilter(cb, labMessage, criteria);
-			filter = BaseAdoService.and(cb, filter, statusFilter);
+			filter = CriteriaBuilderHelper.and(cb, filter, statusFilter);
 		}
 
 		if (filter != null) {
@@ -170,7 +171,7 @@ public List<LabMessageIndexDto> getIndexList(LabMessageCriteria criteria, Intege
 		Predicate filter = null;
 		if (criteria != null) {
 			Predicate statusFilter = labMessageService.createStatusFilter(cb, labMessage, criteria);
-			filter = BaseAdoService.and(cb, filter, statusFilter);
+			filter = CriteriaBuilderHelper.and(cb, filter, statusFilter);
 		}
 
 		if (filter != null) {