Merge pull request #575 from mozzy11/2.8

catch NPE if IHS report params are empty
I-TECH-UW · Oct 26, 2023 · 19ce308 · 19ce308
2 parents 69c3390 + 4d57e64
commit 19ce308
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.../java/org/openelisglobal/reports/action/implementation/DualInSituHybridizationReport.java b/.../java/org/openelisglobal/reports/action/implementation/DualInSituHybridizationReport.java
@@ -23,10 +23,13 @@ protected void setAdditionalReportItems() {
         String reportDetails = MessageUtil.getMessage("dualInSitu.report.details", new String[] {
                 form.getNumberOfcancerNuclei(), form.getAverageHer2(), form.getAverageChrom(), form.getIhcRatio() });
         data.setIhcReportDetails(reportDetails);
-        if (form.getIhcScore().equals("AMPLIFICATION")) {
-            data.setIhcScore(MessageUtil.getMessage("dualInSitu.label.amp"));
-        } else {
-            data.setIhcScore(MessageUtil.getMessage("dualInSitu.label.noAmp"));
+        if (form.getIhcScore() != null) {
+            if (form.getIhcScore().equals("AMPLIFICATION")) {
+                data.setIhcScore(MessageUtil.getMessage("dualInSitu.label.amp"));
+            } else {
+                data.setIhcScore(MessageUtil.getMessage("dualInSitu.label.noAmp"));
+            }
+
         }
     }