Skip to content

Commit e39a04e

Browse files
committed
🐛: FIX: Dashboard - Sample: filters
1 parent f2b861f commit e39a04e

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

sormas-backend/src/main/java/de/symeda/sormas/backend/dashboard/sample/SampleDashboardService.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -533,14 +533,8 @@ private <T extends AbstractDomainObject> Predicate createSampleFilter(SampleQuer
533533
filter = CriteriaBuilderHelper.and(cb, filter, cb.exists(serogroupSubquery));
534534
}
535535
if (criteria.getDiseaseVariant() != null) {
536-
Subquery<Long> variantSubquery = cq.subquery(Long.class);
537-
Root<PathogenTest> pathogenTestRoot = variantSubquery.from(PathogenTest.class);
538-
variantSubquery.select(pathogenTestRoot.get(PathogenTest.ID));
539-
variantSubquery.where(
540-
cb.equal(pathogenTestRoot.get(PathogenTest.SAMPLE), sampleRoot),
541-
cb.equal(pathogenTestRoot.get(PathogenTest.TESTED_DISEASE_VARIANT_VALUE), criteria.getDiseaseVariant().getValue()),
542-
cb.isFalse(pathogenTestRoot.get(PathogenTest.DELETED)));
543-
filter = CriteriaBuilderHelper.and(cb, filter, cb.exists(variantSubquery));
536+
filter = CriteriaBuilderHelper
537+
.and(cb, filter, cb.equal(joins.getCaze().get(Case.DISEASE_VARIANT_VALUE), criteria.getDiseaseVariant().getValue()));
544538
}
545539

546540
if (Boolean.TRUE.equals(criteria.getWithNoDisease())) {

0 commit comments

Comments
 (0)