Merge pull request #637 from mozzy11/2.8

Fix patient history
I-TECH-UW · Dec 7, 2023 · c5f5941 · c5f5941
2 parents 50a6f20 + 46f87c6
commit c5f5941
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/openelisglobal/common/rest/provider/ResultsTreeProviderRestController.java b/src/main/java/org/openelisglobal/common/rest/provider/ResultsTreeProviderRestController.java
@@ -122,9 +122,9 @@ public List<ResultTree> getResultTreeArray(@RequestParam String patientId) {
                           resultType = testService.getResultType(result.getTestResult().getTest());
                         } 
                         resultDisplay.setValue("");
-                        if (resultType.equals("N")) {
-                            resultDisplay.setValue(result.getValue() != null ? result.getValue(true) : "");
-                        } else if (resultType.equals("D")) {
+                        if (resultType.equals("N") || resultType.equals("A") || resultType.equals("R")) {
+                            resultDisplay.setValue(result.getValue() != null ? result.getValue() : "");
+                        } else if (resultType.equals("D")|| resultType.equals("M") || resultType.equals("C")) {
                             if (result.getValue() != null && StringUtils.isNumeric(result.getValue())) {
                                 Dictionary dict = dictionaryService.get(result.getValue());
                                 if (dict != null) {