RA-1945: ParserEncounterIntoSimpleObjects to cast concepts to ConceptNumeric where applicable. (#423)

* RA-1926 Change StringUtils Library

* RA-1945 Add new test to ParserEncounterIntoSimpleObjectsTest

* RA-1945 Rename variables and test names

* RA-1945 Adjust tests

* RA-1945 Concept convert to numericConcept

* RA-1945 Concept convert to numericConcept

* RA-1945 Remove not used ConceptService

* RA-1945 Confirm concept is numeric before going to HibernateUtil

* RA-1945 Minor Refactor in ParserEncounterIntoSimpleObjects.java

* RA-1945 Minor Refactor in ParserEncounterIntoSimpleObjects.java

Author: icrc-jfigueiredo

omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/visit/ParserEncounterIntoSimpleObjects.java

@@ -17,7 +17,10 @@
 import org.openmrs.Location;
 import org.openmrs.Obs;
 import org.openmrs.Order;
+import org.openmrs.Concept;
+import org.openmrs.ConceptNumeric;
 import org.openmrs.api.LocationService;
+import org.openmrs.api.db.hibernate.HibernateUtil;
 import org.openmrs.module.emrapi.EmrApiProperties;
 import org.openmrs.module.emrapi.diagnosis.Diagnosis;
 import org.openmrs.module.emrapi.diagnosis.DiagnosisMetadata;
@@ -39,7 +42,7 @@ public class ParserEncounterIntoSimpleObjects {
 	private Encounter encounter;
 
 	private UiUtils uiUtils;
-	
+
 	private EmrApiProperties emrApiProperties;
 
     private LocationService locationService;
@@ -125,6 +128,12 @@ public int compare(SimpleObject o1, SimpleObject o2) {
 	}
 
 	private SimpleObject parseObs(Obs obs, Locale locale) {
+        Concept concept = obs.getConcept();
+        if (concept != null && concept.isNumeric()) {
+                //TODO HibernateUtil.getRealObjectFromProxy(obs.getConcept()) should be moved to a better place in the future,
+                //If we remove it, the concept type will never be an instanceof ConceptNumeric
+                obs.setConcept(HibernateUtil.getRealObjectFromProxy(concept));
+        }
         if ("org.openmrs.Location".equals(obs.getComment())) {
             return (parseObsWithLocationAnswer(obs, locationService.getLocation(Integer.valueOf(obs.getValueText()))));
         }

omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/visit/VisitDetailsFragmentController.java

@@ -248,4 +248,4 @@ private boolean verifyIfUserHasPermissionToDeleteAnEncounter(Encounter encounter
       boolean userParticipatedInEncounter = encounterDomainWrapper.participatedInEncounter(authenticatedUser);
       return canDelete || userParticipatedInEncounter;
    }
-}
+}

omod/src/main/webapp/fragments/patientdashboard/encountertemplate/defaultEncounterTemplate.gsp

@@ -76,4 +76,4 @@
             <small>${ ui.message("coreapps.patientDashBoard.order")}</small><span>{{- order.concept }}</span>
         </p>
     {{ }); }}
-</script>
+</script>