Skip to content

Bug fixes for samples, tests & SAL #13993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SORMAS-JanBoehme merged 5 commits into from
Jun 19, 2026
Merged

Bug fixes for samples, tests & SAL #13993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
006c35f
Resolves bugs that surfaced due to the addition of quantitative resul…
roldy Jun 19, 2026
a8efb38
#13951 Lab test categories: split ELISA, merge Culture/Isolation, add…
roldy Jun 19, 2026
a409a1b
#13955 Lab results AST table: merge MIC+Zone into Value, drop Surveil…
roldy Jun 19, 2026
0d99f46
Fixes issues reported for SAL disease
roldy Jun 19, 2026
1c33968
Fixes issues reported for SAL disease
roldy Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,13 +928,11 @@ public interface Captions {
String caseLabResultsDateCollected = "caseLabResultsDateCollected";
String caseLabResultsDrugSusceptibilityHeading = "caseLabResultsDrugSusceptibilityHeading";
String caseLabResultsMethod = "caseLabResultsMethod";
String caseLabResultsMicValue = "caseLabResultsMicValue";
String caseLabResultsSample = "caseLabResultsSample";
String caseLabResultsSamplesHeading = "caseLabResultsSamplesHeading";
String caseLabResultsSurveillanceInterpretation = "caseLabResultsSurveillanceInterpretation";
String caseLabResultsTestsHeading = "caseLabResultsTestsHeading";
String caseLabResultsTestsPerformed = "caseLabResultsTestsPerformed";
String caseLabResultsZoneDiameter = "caseLabResultsZoneDiameter";
String caseLabResultsValue = "caseLabResultsValue";
String caseLinkToSamples = "caseLinkToSamples";
String caseMergeDuplicates = "caseMergeDuplicates";
String caseMinusDays = "caseMinusDays";
Expand Down Expand Up @@ -2424,7 +2422,6 @@ public interface Captions {
String PathogenTest_prescriberPhysicianCode = "PathogenTest.prescriberPhysicianCode";
String PathogenTest_prescriberPostalCode = "PathogenTest.prescriberPostalCode";
String PathogenTest_quantitativeBoolean = "PathogenTest.quantitativeBoolean";
String PathogenTest_quantitativeText = "PathogenTest.quantitativeText";
String PathogenTest_quantitativeUnit = "PathogenTest.quantitativeUnit";
String PathogenTest_quantitativeValue = "PathogenTest.quantitativeValue";
String PathogenTest_reportDate = "PathogenTest.reportDate";
Expand Down Expand Up @@ -3304,6 +3301,7 @@ public interface Captions {
String Symptoms_uproariousness = "Symptoms.uproariousness";
String Symptoms_urinaryRetention = "Symptoms.urinaryRetention";
String Symptoms_vomiting = "Symptoms.vomiting";
String Symptoms_wateryDiarrhea = "Symptoms.wateryDiarrhea";
String Symptoms_weakness = "Symptoms.weakness";
String Symptoms_weight = "Symptoms.weight";
String Symptoms_weightLoss = "Symptoms.weightLoss";
Expand Down
50 changes: 45 additions & 5 deletions sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenSpecie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -70,6 +73,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -83,6 +89,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -96,6 +105,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -109,6 +121,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -122,6 +137,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -135,6 +153,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -148,6 +169,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -161,6 +185,9 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
Expand All @@ -174,35 +201,40 @@ public enum PathogenSpecie {
@ApplicableToPathogenTests(value = {
PathogenTestType.SEROGROUPING,
PathogenTestType.SEROTYPING,
PathogenTestType.BACTERIAL_CULTURE })
PathogenTestType.BACTERIAL_CULTURE,
PathogenTestType.CULTURE })
BOYDII,
@Diseases(value = {
Disease.SHIGELLOSIS })
@ApplicableToPathogenTests(value = {
PathogenTestType.SEROGROUPING,
PathogenTestType.SEROTYPING,
PathogenTestType.BACTERIAL_CULTURE })
PathogenTestType.BACTERIAL_CULTURE,
PathogenTestType.CULTURE })
DYSENTERIAE,
@Diseases(value = {
Disease.SHIGELLOSIS })
@ApplicableToPathogenTests(value = {
PathogenTestType.SEROGROUPING,
PathogenTestType.SEROTYPING,
PathogenTestType.BACTERIAL_CULTURE })
PathogenTestType.BACTERIAL_CULTURE,
PathogenTestType.CULTURE })
FLEXNERI,
@Diseases(value = {
Disease.SHIGELLOSIS })
@ApplicableToPathogenTests(value = {
PathogenTestType.SEROGROUPING,
PathogenTestType.SEROTYPING,
PathogenTestType.BACTERIAL_CULTURE })
PathogenTestType.BACTERIAL_CULTURE,
PathogenTestType.CULTURE })
SONNEI,
@Diseases(value = {
Disease.SHIGELLOSIS })
@ApplicableToPathogenTests(value = {
PathogenTestType.SEROGROUPING,
PathogenTestType.SEROTYPING,
PathogenTestType.BACTERIAL_CULTURE })
PathogenTestType.BACTERIAL_CULTURE,
PathogenTestType.CULTURE })
SHIGELLA_SPP,
@Diseases({
Disease.MALARIA,
Expand All @@ -211,13 +243,17 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
PathogenTestType.LAMP,
PathogenTestType.OTHER_MOLECULAR_ASSAY,
PathogenTestType.OTHER_SEROLOGICAL_TEST,
PathogenTestType.BACTERIAL_CULTURE,
PathogenTestType.CULTURE,
PathogenTestType.SEROGROUPING,
PathogenTestType.SEROTYPING })
OTHER,
Expand All @@ -231,13 +267,17 @@ public enum PathogenSpecie {
PathogenTestType.THIN_BLOOD_SMEAR,
PathogenTestType.RAPID_TEST,
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
PathogenTestType.IGM_SERUM_ANTIBODY,
PathogenTestType.IGG_SERUM_ANTIBODY,
PathogenTestType.IGA_SERUM_ANTIBODY,
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
PathogenTestType.PCR_RT_PCR,
PathogenTestType.Q_PCR,
PathogenTestType.LAMP,
PathogenTestType.OTHER_MOLECULAR_ASSAY,
PathogenTestType.OTHER_SEROLOGICAL_TEST,
PathogenTestType.BACTERIAL_CULTURE,
PathogenTestType.CULTURE,
PathogenTestType.SEROGROUPING,
PathogenTestType.SEROTYPING })
UNKNOWN,
Expand Down
12 changes: 0 additions & 12 deletions sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ public class PathogenTestDto extends PseudonymizableDto {
public static final String RESULT_DETAILS = "resultDetails";
public static final String QUANTITATIVE_VALUE = "quantitativeValue";
public static final String QUANTITATIVE_UNIT = "quantitativeUnit";
public static final String QUANTITATIVE_TEXT = "quantitativeText";
public static final String QUANTITATIVE_BOOLEAN = "quantitativeBoolean";
public static final String SMEAR_GRADE = "smearGrade";
public static final String WESTERN_BLOT_INTERPRETATION = "westernBlotInterpretation";
Expand Down Expand Up @@ -346,9 +345,6 @@ public class PathogenTestDto extends PseudonymizableDto {
private Float quantitativeValue;
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
private String quantitativeUnit;
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
@SensitiveData
private String quantitativeText;
private YesNoUnknown quantitativeBoolean;
private SmearGrade smearGrade;
private WesternBlotInterpretation westernBlotInterpretation;
Expand Down Expand Up @@ -1014,14 +1010,6 @@ public void setQuantitativeUnit(String quantitativeUnit) {
this.quantitativeUnit = quantitativeUnit;
}

public String getQuantitativeText() {
return quantitativeText;
}

public void setQuantitativeText(String quantitativeText) {
this.quantitativeText = quantitativeText;
}

public YesNoUnknown getQuantitativeBoolean() {
return quantitativeBoolean;
}
Expand Down
Loading
Loading