Merge pull request #1233 from CalebSLane/develop

fix broken reflexes for dictionary
I-TECH-UW · Aug 13, 2024 · 8053b98 · 8053b98
2 parents c577e8c + 2cbd585
commit 8053b98
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/org/openelisglobal/testreflex/action/util/TestReflexUtil.java b/src/main/java/org/openelisglobal/testreflex/action/util/TestReflexUtil.java
@@ -330,7 +330,13 @@ private List<TestReflex> getReflexTests(TestReflexBean reflexBean) {
         if (reflexBean.getResult().getTestResult() == null) {
             return new ArrayList<>();
         }
-        List<TestReflex> reflexesForResult = reflexResolver.getTestReflexesForResult(reflexBean.getResult());
+        String resultType = testService.getResultType(reflexBean.getResult().getTestResult().getTest());
+        List<TestReflex> reflexesForResult;
+        if (resultType.equals("D")) {
+            reflexesForResult = reflexResolver.getTestReflexsByAnalyteAndTest(reflexBean.getResult());
+        } else {
+            reflexesForResult = reflexResolver.getTestReflexesForResult(reflexBean.getResult());
+        }
         reflexesForResult = reflexesForResult.stream()
                 .filter(e -> isTestTriggeredByResult(e.getAddedTest(), reflexBean.getResult()))
                 .collect(Collectors.toList());
@@ -876,6 +882,7 @@ public boolean doesDictionaryRelationRulesForReflexApply(Test potentialReflexTes
                     }
                 }
             }
+
             return false;
 
         });