Merge pull request #484 from mozzy11/2.8

fix NPE
I-TECH-UW · Jul 26, 2023 · 1769ad3 · 1769ad3
2 parents f24f6de + 5840ffa
commit 1769ad3
Showing 1 changed file with 5 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
@@ -300,7 +300,11 @@ public int compare(TestReflexBean o1, TestReflexBean o2) {
                         if (rule.getOverall().equals(ReflexRuleOptions.OverallOptions.ALL)) {
                             Set<Integer> testAnalyteIds = new HashSet<>();
                             rule.getConditions().forEach(c -> testAnalyteIds.add(c.getTestAnalyteId()));
-                            if (testAnalyteIds.size() > analyteTestMap.get(analyteId).size()) {
+                            if (analyteTestMap.get(analyteId) != null) {
+                                if (testAnalyteIds.size() > analyteTestMap.get(analyteId).size()) {
+                                    newReflexAnalyses = new ArrayList<>();
+                                }
+                            }else {
                                 newReflexAnalyses = new ArrayList<>();
                             }
                         }