RESTWS-962: Return empty result when the specified encounter type is …

…not found
openmrs · Dec 11, 2024 · 9499895 · 9499895
1 parent 9786f8d
commit 9499895
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...openmrs/module/webservices/rest/web/v1_0/search/openmrs2_0/EncounterSearchHandler2_0.java b/...openmrs/module/webservices/rest/web/v1_0/search/openmrs2_0/EncounterSearchHandler2_0.java
@@ -73,7 +73,7 @@ public PageableResult search(RequestContext context) throws ResponseException {
 		EncounterType encounterType = ((EncounterTypeResource1_8) Context.getService(RestService.class)
 				.getResourceBySupportedClass(EncounterType.class)).getByUniqueId(encounterTypeUuid);
 
-		if (patient != null) {
+		if (patient != null && (encounterType != null || encounterTypeUuid == null)) {
 			EncounterSearchCriteriaBuilder encounterSearchCriteriaBuilder = new EncounterSearchCriteriaBuilder()
 					.setPatient(patient).setFromDate(fromDate).setToDate(toDate).setIncludeVoided(false);
 			if (encounterType != null) {