Fix NumberFormatException

Author: dkayiwa

omod/src/main/java/org/openmrs/module/xforms/page/controller/PatientRegUrlHandler.java

@@ -89,7 +89,7 @@ public String handleEditEncounterPage(HttpServletRequest request, HttpServletRes
 		String encounterId = request.getParameter("encounterId");
 		String patientId = request.getParameter("patientId");
 		if (StringUtils.isNotBlank(encounterId) && StringUtils.isNotBlank(patientId)) {
-			Encounter encounter = Context.getEncounterService().getEncounter(Integer.parseInt(encounterId));
+			Encounter encounter = getEncounter(encounterId);
 			if (encounter != null && encounter.getForm() != null) {
 				Xform xform = Context.getService(XformsService.class).getXform(encounter.getForm());
 				if (xform != null) {
@@ -106,6 +106,15 @@ public String handleEditEncounterPage(HttpServletRequest request, HttpServletRes
 		return handlePath(path, request, response, model, httpSession);
 	}
 
+	private Encounter getEncounter(String encounterId) {
+		try {
+			return Context.getEncounterService().getEncounter(Integer.parseInt(encounterId));
+		}
+		catch (NumberFormatException ex) {
+			return Context.getEncounterService().getEncounterByUuid(encounterId);
+		}
+	}
+	
 	/**
      * @param path should be of the form "provider/optional/subdirectories/pageName"
      * @param request