Merge pull request #13741 from SORMAS-Foundation/bugfix-pathogen_test_form_npe

raulbob · web-flow · commit 9c8b30ec3b83 · 2025-11-25T12:18:15.000+01:00
Fixed NPEs caused by List.of().contains(null) in PathogenTestForm.java
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java
@@ -244,7 +244,8 @@ private static void setCqValueVisibility(
 		TextField cqValueField,
 		PathogenTestType testType,
 		PathogenTestResultType testResultType) {
-		if (!List.of(Disease.TUBERCULOSIS).contains((Disease) diseaseField.getValue())) {
+
+		if (diseaseField.getValue() == null || !List.of(Disease.TUBERCULOSIS).contains((Disease) diseaseField.getValue())) {
 			if (((testType == PathogenTestType.PCR_RT_PCR && testResultType == PathogenTestResultType.POSITIVE))
 				|| testType == PathogenTestType.CQ_VALUE_DETECTION) {
 				cqValueField.setVisible(true);
@@ -1211,7 +1212,7 @@ protected void addFields() {
 
 				updateDrugSusceptibilityFieldSpecifications(testType, (Disease) diseaseField.getValue());
 
-				if (!List.of(Disease.TUBERCULOSIS).contains((Disease) diseaseField.getValue())) {
+				if (diseaseField.getValue() == null || !List.of(Disease.TUBERCULOSIS).contains((Disease) diseaseField.getValue())) {
 					setVisibleClear(
 						PathogenTestType.PCR_RT_PCR == testType,
 						PathogenTestDto.CQ_VALUE,
