COH-57 Cohort members with filled end dates should not be returned

openmrs · Mar 4, 2024 · c8d837c · c8d837c
1 parent 296006b
commit c8d837c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/module/cohort/api/impl/CohortMemberServiceImpl.java b/api/src/main/java/org/openmrs/module/cohort/api/impl/CohortMemberServiceImpl.java
@@ -154,8 +154,11 @@ public Collection<CohortMember> findCohortMembersByCohortUuid(String cohortUuid)
 	@Override
 	@Transactional(readOnly = true)
 	public Collection<CohortMember> findCohortMembersByPatientUuid(String patientUuid) {
-		return cohortMemberDao.findBy(
-		    PropValue.builder().property("uuid").associationPath(Optional.of("patient")).value(patientUuid).build());
+		Criteria criteria = cohortMemberDao.createCriteria();
+		criteria.createAlias("patient", "patient");
+		criteria.add(Restrictions.eq("patient.uuid", patientUuid));
+		criteria.add(Restrictions.isNull("endDate"));
+		return criteria.list();
 	}
 
 	@Override