Fixing failing unit tests for: Encounter autocomplete should filter

results by patient - TRUNK-3231 (cherry picked from commit 90fa765)
openmrs · Jul 3, 2013 · b08423c · b08423c
1 parent 769bf7d
commit b08423c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
@@ -351,8 +351,9 @@ private Criteria createEncounterByQueryCriteria(String query, Integer patientId,
 		if (!includeVoided)
 			criteria.add(Restrictions.eq("enc.voided", false));
 
+		criteria = criteria.createCriteria("patient", "pat");
 		if (patientId != null) {
-			criteria.add(Restrictions.eq("enc.patientId", patientId));
+			criteria.add(Restrictions.eq("pat.patientId", patientId));
 			if (StringUtils.isNotBlank(query)) {
 				criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
 				//match on location.name, encounterType.name, form.name
@@ -399,7 +400,6 @@ private Criteria createEncounterByQueryCriteria(String query, Integer patientId,
 				criteria.add(or);
 			}
 		} else {
-			criteria = criteria.createCriteria("patient", "pat");
 			String name = null;
 			String identifier = null;
 			if (query.matches(".*\\d+.*")) {