LUI-197 - unescaping referencerange criteria

(cherry picked from commit 561d059)

Author: dkayiwa

omod/src/main/java/org/openmrs/web/controller/concept/ConceptReferenceRange.java

@@ -9,6 +9,7 @@
  */
 package org.openmrs.web.controller.concept;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.openmrs.ConceptNumeric;
 
 /**
@@ -77,7 +78,7 @@ public String getCriteria() {
 	 * @param criteria the criteria to set
 	 */
 	public void setCriteria(String criteria) {
-		this.criteria = criteria;
+		this.criteria = StringEscapeUtils.unescapeHtml4(criteria);
 	}
 
 	/**

omod/src/main/java/org/openmrs/web/controller/mappper/ConceptFormMapper.java

@@ -9,7 +9,6 @@
  */
 package org.openmrs.web.controller.mappper;
 
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.ConceptNumeric;
@@ -84,7 +83,7 @@ public List<ConceptReferenceRange> mapToWebReferenceRanges(ConceptNumeric cn) {
 
                 webReferenceRange.setConceptReferenceRangeId((Integer) referenceRange.getClass().getMethod("getConceptReferenceRangeId").invoke(referenceRange));
                 webReferenceRange.setUuid((String) referenceRange.getClass().getMethod("getUuid").invoke(referenceRange));
-                webReferenceRange.setCriteria(StringEscapeUtils.unescapeHtml4((String) referenceRange.getClass().getMethod("getCriteria").invoke(referenceRange)));
+                webReferenceRange.setCriteria((String) referenceRange.getClass().getMethod("getCriteria").invoke(referenceRange));
                 webReferenceRange.setHiAbsolute((Double) referenceRange.getClass().getMethod("getHiAbsolute").invoke(referenceRange));
                 webReferenceRange.setHiCritical((Double) referenceRange.getClass().getMethod("getHiCritical").invoke(referenceRange));
                 webReferenceRange.setHiNormal((Double) referenceRange.getClass().getMethod("getHiNormal").invoke(referenceRange));