Merge branch 'development' of https://github.com/SORMAS-Foundation/SORMAS-Project into fix/13830-national-user-cannot-be-responsible-user

Author: Pa-Touche

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseCriteria.java

@@ -35,6 +35,7 @@
 import de.symeda.sormas.api.person.PersonReferenceDto;
 import de.symeda.sormas.api.person.PresentCondition;
 import de.symeda.sormas.api.person.SymptomJournalStatus;
+import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.share.ExternalShareCriteria;
 import de.symeda.sormas.api.survey.SurveyReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
@@ -92,10 +93,14 @@ public class CaseCriteria extends CriteriaWithDateType implements ExternalShareC
 	public static final String SURVEY_ASSIGNED_TO = "surveyAssignedTo";
 	public static final String SURVEY_RESPONSE_STATUS = "surveyResponseStatus";
 	public static final String SURVEY = "survey";
+	public static final String PATHOGEN_TEST_RESULT = "pathogenTestResult";
+	public static final String SEROGROUP = "serogroup";
 
 	private UserRoleReferenceDto reportingUserRole;
 	private Disease disease;
 	private DiseaseVariant diseaseVariant;
+	private PathogenTestResultType pathogenTestResult;
+	private String serogroup;
 	private CaseOutcome outcome;
 	private CaseClassification caseClassification;
 	private InvestigationStatus investigationStatus;
@@ -235,6 +240,33 @@ public DiseaseVariant getDiseaseVariant() {
 		return diseaseVariant;
 	}
 
+	public void setPathogenTestResult(PathogenTestResultType pathogenTestResult) {
+		this.pathogenTestResult = pathogenTestResult;
+	}
+
+	public CaseCriteria pathogenTestResult(PathogenTestResultType pathogenTestResult) {
+		setPathogenTestResult(pathogenTestResult);
+		return this;
+	}
+
+	public PathogenTestResultType getPathogenTestResult() {
+		return pathogenTestResult;
+	}
+
+	public void setSerogroup(String serogroup) {
+		this.serogroup = serogroup;
+	}
+
+	public CaseCriteria serogroup(String serogroup) {
+		setSerogroup(serogroup);
+		return this;
+	}
+
+	@IgnoreForUrl
+	public String getSerogroup() {
+		return serogroup;
+	}
+
 	public void setJurisdictionType(CaseJurisdictionType jurisdictionType) {
 		this.jurisdictionType = jurisdictionType;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/clinicalcourse/HealthConditionsDto.java

@@ -60,7 +60,7 @@ public class HealthConditionsDto extends PseudonymizableDto {
 	public static final String VACCINATED_AGAINST_MOSQUITO_BORNE_VIRUSES = "vaccinatedAgainstMosquitoBorneViruses";
 	public static final String MALARIA = "malaria";
 	public static final String MALARIA_INFECTED_YEAR = "malariaInfectedYear";
-	public static final String UNDER_MEDICATION = "underMedication";
+	public static final String ON_MEDICATION = "onMedication";
 	public static final String MEDICATION_DETAILS = "medicationDetails";
 	public static final String CHRONIC_DISEASE = "chronicDisease";
 	public static final String CHRONIC_DISEASE_DETAILS = "chronicDiseaseDetails";
@@ -201,7 +201,7 @@ public class HealthConditionsDto extends PseudonymizableDto {
 	private Integer malariaInfectedYear;
 	@Diseases(value = {
 		Disease.SHIGELLOSIS })
-	private YesNoUnknown underMedication;
+	private YesNoUnknown onMedication;
 	@Diseases(value = {
 		Disease.SHIGELLOSIS })
 	private String medicationDetails;
@@ -506,12 +506,12 @@ public void setMalariaInfectedYear(Integer malariaInfectedYear) {
 		this.malariaInfectedYear = malariaInfectedYear;
 	}
 
-	public YesNoUnknown getUnderMedication() {
-		return underMedication;
+	public YesNoUnknown getOnMedication() {
+		return onMedication;
 	}
 
-	public void setUnderMedication(YesNoUnknown underMedication) {
-		this.underMedication = underMedication;
+	public void setOnMedication(YesNoUnknown onMedication) {
+		this.onMedication = onMedication;
 	}
 
 	public String getMedicationDetails() {

sormas-api/src/main/java/de/symeda/sormas/api/dashboard/SampleDashboardCriteria.java

@@ -15,7 +15,9 @@
 
 package de.symeda.sormas.api.dashboard;
 
+import de.symeda.sormas.api.disease.DiseaseVariant;
 import de.symeda.sormas.api.environment.environmentsample.EnvironmentSampleMaterial;
+import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.sample.SampleDashboardFilterDateType;
 import de.symeda.sormas.api.sample.SampleMaterial;
 
@@ -24,6 +26,9 @@ public class SampleDashboardCriteria extends BaseDashboardCriteria<SampleDashboa
 	private SampleDashboardFilterDateType sampleDateType;
 	private SampleMaterial sampleMaterial;
 	private EnvironmentSampleMaterial environmentSampleMaterial;
+	private PathogenTestResultType pathogenTestResult;
+	private String serogroup;
+	private DiseaseVariant diseaseVariant;
 
 	private Boolean withNoDisease;
 
@@ -60,12 +65,44 @@ public SampleDashboardCriteria withNoDisease(Boolean withNoDisease) {
 
 		return self;
 	}
+
 	public EnvironmentSampleMaterial getEnvironmentSampleMaterial() {
 		return environmentSampleMaterial;
 	}
+
 	public SampleDashboardCriteria environmentSampleMaterial(EnvironmentSampleMaterial environmentSampleMaterial) {
 		this.environmentSampleMaterial = environmentSampleMaterial;
 
 		return self;
 	}
+
+	public PathogenTestResultType getPathogenTestResult() {
+		return pathogenTestResult;
+	}
+
+	public SampleDashboardCriteria pathogenTestResult(PathogenTestResultType pathogenTestResult) {
+		this.pathogenTestResult = pathogenTestResult;
+
+		return self;
+	}
+
+	public String getSerogroup() {
+		return serogroup;
+	}
+
+	public SampleDashboardCriteria serogroup(String serogroup) {
+		this.serogroup = serogroup;
+
+		return self;
+	}
+
+	public DiseaseVariant getDiseaseVariant() {
+		return diseaseVariant;
+	}
+
+	public SampleDashboardCriteria diseaseVariant(DiseaseVariant diseaseVariant) {
+		this.diseaseVariant = diseaseVariant;
+
+		return self;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureDto.java

@@ -142,6 +142,7 @@ public class ExposureDto extends PseudonymizableDto {
 	public static final String TRAVEL_PURPOSE = "travelPurpose";
 	public static final String TRAVEL_PURPOSE_DETAILS = "travelPurposeDetails";
 	public static final String SHOPPING_FOR_FOOD_DETAILS = "shoppingForFoodDetails";
+	public static final String SEXUAL_CONTACT = "sexualContact";
 
 	@SensitiveData
 	private UserReferenceDto reportingUser;
@@ -466,6 +467,11 @@ public class ExposureDto extends PseudonymizableDto {
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String shoppingForFoodDetails;
 
+	@Diseases({
+		Disease.SHIGELLOSIS })
+	@SensitiveData
+	private SexualContact sexualContact;
+
 	public static ExposureDto build(ExposureType exposureType) {
 
 		ExposureDto exposure = new ExposureDto();
@@ -1169,6 +1175,14 @@ public void setShoppingForFoodDetails(String shoppingForFoodDetails) {
 		this.shoppingForFoodDetails = shoppingForFoodDetails;
 	}
 
+	public SexualContact getSexualContact() {
+		return sexualContact;
+	}
+
+	public void setSexualContact(SexualContact sexualContact) {
+		this.sexualContact = sexualContact;
+	}
+
 	@Override
 	public ExposureDto clone() throws CloneNotSupportedException {
 		ExposureDto clone = (ExposureDto) super.clone();

sormas-api/src/main/java/de/symeda/sormas/api/exposure/ExposureSubSetting.java

@@ -51,6 +51,9 @@ public enum ExposureSubSetting {
 
 	EATING_AT_HOME(ExposureCategory.FOOD_BORNE, null),
 	EATING_OUTSIDE(ExposureCategory.FOOD_BORNE, null),
+	@Diseases({
+		Disease.SHIGELLOSIS })
+	HOUSEHOLD_CONTACT(ExposureCategory.DIRECT_CONTACT, ExposureSetting.PERSON_TO_PERSON),
 	@Diseases({
 		Disease.SALMONELLOSIS })
 	SHOPPING_FOR_FOOD(ExposureCategory.FOOD_BORNE, null),

sormas-api/src/main/java/de/symeda/sormas/api/exposure/SexualContact.java

@@ -0,0 +1,35 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 SORMAS Foundation gGmbH
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.symeda.sormas.api.exposure;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Enum for sexual contact types.
+ */
+public enum SexualContact {
+
+	MALE,
+	FEMALE,
+	BOTH,
+	NOT_ANSWERED,
+	UNKNOWN,
+	OTHER;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/labmessage/TestReportDto.java

@@ -15,6 +15,7 @@
 import de.symeda.sormas.api.sample.PCRTestSpecification;
 import de.symeda.sormas.api.sample.PathogenSpecie;
 import de.symeda.sormas.api.sample.PathogenStrainCallStatus;
+import de.symeda.sormas.api.sample.PathogenTestCategory;
 import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.sample.PathogenTestType;
 import de.symeda.sormas.api.sample.RsvSubtype;
@@ -217,6 +218,9 @@ public class TestReportDto extends EntityDto {
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
 	private String serotypeText;
 
+	private PathogenTestCategory pathogenTestCategory;
+	private boolean fourFoldIncreaseAntibodyTiter;
+
 	public SampleReportReferenceDto getSampleReport() {
 		return sampleReport;
 	}
@@ -912,4 +916,20 @@ public void setSerotypeText(String serotypeText) {
 		this.serotypeText = serotypeText;
 	}
 
+	public PathogenTestCategory getPathogenTestCategory() {
+		return pathogenTestCategory;
+	}
+
+	public void setPathogenTestCategory(PathogenTestCategory pathogenTestCategory) {
+		this.pathogenTestCategory = pathogenTestCategory;
+	}
+
+	public boolean getFourFoldIncreaseAntibodyTiter() {
+		return fourFoldIncreaseAntibodyTiter;
+	}
+
+	public void setFourFoldIncreaseAntibodyTiter(boolean fourFoldIncreaseAntibodyTiter) {
+		this.fourFoldIncreaseAntibodyTiter = fourFoldIncreaseAntibodyTiter;
+	}
+
 }

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/ExternalMessageMapper.java

@@ -988,7 +988,15 @@ public List<String[]> mapToPathogenTest(TestReportDto sourceTestReport, Pathogen
 							pathogenTest.getDrugSusceptibility().getErythromycinSusceptibility(),
 							sourceTestReport.getErythromycinSusceptibility(),
 							PathogenTestDto.DRUG_SUSCEPTIBILITY,
-							DrugSusceptibilityDto.ERYTHROMYCIN_SUSCEPTIBILITY))));
+							DrugSusceptibilityDto.ERYTHROMYCIN_SUSCEPTIBILITY),
+
+						Mapping.of(
+							pathogenTest::setFourFoldIncreaseAntibodyTiter,
+							pathogenTest.isFourFoldIncreaseAntibodyTiter(),
+							sourceTestReport.getFourFoldIncreaseAntibodyTiter(),
+							PathogenTestDto.FOUR_FOLD_INCREASE_ANTIBODY_TITER))
+
+				));
 		}
 
 		changedFields.addAll(

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -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";
@@ -1645,6 +1643,7 @@ public interface Captions {
 	String EpiData_clusterTypeText = "EpiData.clusterTypeText";
 	String EpiData_contactWithSourceCaseKnown = "EpiData.contactWithSourceCaseKnown";
 	String EpiData_country = "EpiData.country";
+	String EpiData_country_SHIG = "EpiData.country.SHIG";
 	String EpiData_exposureDetailsKnown = "EpiData.exposureDetailsKnown";
 	String EpiData_exposureInvestigationFromDate = "EpiData.exposureInvestigationFromDate";
 	String EpiData_exposureInvestigationToDate = "EpiData.exposureInvestigationToDate";
@@ -1968,6 +1967,7 @@ public interface Captions {
 	String Exposure_rawFoodContactText = "Exposure.rawFoodContactText";
 	String Exposure_riskArea = "Exposure.riskArea";
 	String Exposure_seatNumber = "Exposure.seatNumber";
+	String Exposure_sexualContact = "Exposure.sexualContact";
 	String Exposure_sexualExposureText = "Exposure.sexualExposureText";
 	String Exposure_shoppingForFoodDetails = "Exposure.shoppingForFoodDetails";
 	String Exposure_shortDistance = "Exposure.shortDistance";
@@ -2139,13 +2139,13 @@ public interface Captions {
 	String HealthConditions_malignancyChemotherapy = "HealthConditions.malignancyChemotherapy";
 	String HealthConditions_medicationDetails = "HealthConditions.medicationDetails";
 	String HealthConditions_obesity = "HealthConditions.obesity";
+	String HealthConditions_onMedication = "HealthConditions.onMedication";
 	String HealthConditions_otherConditions = "HealthConditions.otherConditions";
 	String HealthConditions_previousTuberculosisTreatment = "HealthConditions.previousTuberculosisTreatment";
 	String HealthConditions_recurrentBronchiolitis = "HealthConditions.recurrentBronchiolitis";
 	String HealthConditions_sickleCellDisease = "HealthConditions.sickleCellDisease";
 	String HealthConditions_tuberculosis = "HealthConditions.tuberculosis";
 	String HealthConditions_tuberculosisInfectionYear = "HealthConditions.tuberculosisInfectionYear";
-	String HealthConditions_underMedication = "HealthConditions.underMedication";
 	String HealthConditions_vaccinatedAgainstMosquitoBorneViruses = "HealthConditions.vaccinatedAgainstMosquitoBorneViruses";
 	String humanSampleViewType = "humanSampleViewType";
 	String Immunization = "Immunization";
@@ -2423,7 +2423,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";
@@ -2893,6 +2892,7 @@ public interface Captions {
 	String selfReportDeletedEnvironments = "selfReportDeletedEnvironments";
 	String selfReportProcess = "selfReportProcess";
 	String selfReportSelfReportsList = "selfReportSelfReportsList";
+	String serogroup = "serogroup";
 	String sex = "sex";
 	String showPlacesOnMap = "showPlacesOnMap";
 	String singleDayEventDate = "singleDayEventDate";
@@ -3302,6 +3302,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";