Merge pull request #13770 from SORMAS-Foundation/bugfix-13769-tuberculosis_beijing_flag_always_true

raulbob · web-flow · commit 87e7d449f86b · 2025-12-09T17:11:02.000+01:00
Fixed issue in Therapy causing Beijing lineage flag to always be true
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/TherapyForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/TherapyForm.java
@@ -44,6 +44,7 @@
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
+import de.symeda.sormas.api.sample.PathogenStrainCallStatus;
 import de.symeda.sormas.api.sample.PathogenTestDto;
 import de.symeda.sormas.api.sample.PathogenTestType;
 import de.symeda.sormas.api.sample.SampleDto;
@@ -437,7 +438,9 @@ public void attach() {
 			}
 		}
 
-		if (latestBejingGenotypingTest != null) {
+		if (latestBejingGenotypingTest != null
+			&& latestBejingGenotypingTest.getStrainCallStatus() != null
+			&& latestBejingGenotypingTest.getStrainCallStatus() == PathogenStrainCallStatus.BEIJING) {
 			beijingLineageField.setValue(true);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`import de.symeda.sormas.api.i18n.Captions;`
`45`	`45`	`import de.symeda.sormas.api.i18n.I18nProperties;`
`46`	`46`	`import de.symeda.sormas.api.i18n.Strings;`
	`47`	`+import de.symeda.sormas.api.sample.PathogenStrainCallStatus;`
`47`	`48`	`import de.symeda.sormas.api.sample.PathogenTestDto;`
`48`	`49`	`import de.symeda.sormas.api.sample.PathogenTestType;`
`49`	`50`	`import de.symeda.sormas.api.sample.SampleDto;`
`@@ -437,7 +438,9 @@ public void attach() {`
`437`	`438`	`}`
`438`	`439`	`}`
`439`	`440`
`440`		`- if (latestBejingGenotypingTest != null) {`
	`441`	`+ if (latestBejingGenotypingTest != null`
	`442`	`+ && latestBejingGenotypingTest.getStrainCallStatus() != null`
	`443`	`+ && latestBejingGenotypingTest.getStrainCallStatus() == PathogenStrainCallStatus.BEIJING) {`
`441`	`444`	`beijingLineageField.setValue(true);`
`442`	`445`	`}`
`443`	`446`	`}`