Merge pull request #13582 from SORMAS-Foundation/feature-13365-enhance-case-data-form-for-measles

Feature 13365 enhance case data form for measles

Author: KarnaiahPesula

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

@@ -17,12 +17,22 @@
  *******************************************************************************/
 package de.symeda.sormas.api.caze;
 
+import de.symeda.sormas.api.CountryHelper;
+import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.utils.Diseases;
+import de.symeda.sormas.api.utils.HideForCountriesExcept;
 
 public enum VaccinationStatus {
 
 	VACCINATED,
 	UNVACCINATED,
+	@Diseases(value = {Disease.MEASLES})
+	VACCINATED_ONE_DOSE,
+	@Diseases(value = {Disease.MEASLES})
+	VACCINATED_TWO_DOSE,
+	@Diseases(value = {Disease.MEASLES})
+	RECOVERED,
 	UNKNOWN;
 
 	@Override

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java

@@ -154,6 +154,11 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
 	public static final String PROPHYLAXIS_PRESCRIBED = "prophylaxisPrescribed";
 	public static final String PRESCRIBED_DRUG = "prescribedDrug";
 	public static final String PRESCRIBED_DRUG_TEXT = "prescribedDrugText";
+	public static final String VACCINATION_PROPOSED = "vaccinationProposed";
+	public static final String IMMUNE_GLOBULIN_PROPOSED = "immuneGlobulinProposed";
+
+	public static final String VACCINATION_DOSE_ONE_DATE = "vaccinationDoseOneDate";
+	public static final String VACCINATION_DOSE_TWO_DATE = "vaccinationDoseTwoDate";
 
 	@EmbeddedPersonalData
 	private CaseReferenceDto caze;
@@ -365,6 +370,13 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
 	@Outbreaks
 	private VaccinationStatus vaccinationStatus;
 
+	@Diseases(value = {Disease.MEASLES})
+	@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
+	private Date vaccinationDoseOneDate;
+	@Diseases(value = {Disease.MEASLES})
+	@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
+	private Date vaccinationDoseTwoDate;
+
 	private Date previousQuarantineTo;
 	@SensitiveData
 	@Size(max = CHARACTER_LIMIT_BIG, message = Validations.textTooLong)
@@ -385,6 +397,12 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
 	@SensitiveData
 	@Diseases(Disease.INVASIVE_MENINGOCOCCAL_INFECTION)
 	private String prescribedDrugText;
+	@Diseases(value = {Disease.MEASLES})
+	@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
+	private boolean vaccinationProposed;
+	@Diseases(value = {Disease.MEASLES})
+	@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
+	private boolean immuneGlobulinProposed;
 
 	public static ContactDto build() {
 		final ContactDto contact = new ContactDto();
@@ -1109,4 +1127,35 @@ public void setPrescribedDrugText(String prescribedDrugText) {
 		this.prescribedDrugText = prescribedDrugText;
 	}
 
+	public Date getVaccinationDoseOneDate() {
+		return vaccinationDoseOneDate;
+	}
+
+	public void setVaccinationDoseOneDate(Date vaccinationDoseOneDate) {
+		this.vaccinationDoseOneDate = vaccinationDoseOneDate;
+	}
+
+	public Date getVaccinationDoseTwoDate() {
+		return vaccinationDoseTwoDate;
+	}
+
+	public void setVaccinationDoseTwoDate(Date vaccinationDoseTwoDate) {
+		this.vaccinationDoseTwoDate = vaccinationDoseTwoDate;
+	}
+
+	public boolean isVaccinationProposed() {
+		return vaccinationProposed;
+	}
+
+	public void setVaccinationProposed(boolean vaccinationProposed) {
+		this.vaccinationProposed = vaccinationProposed;
+	}
+
+	public boolean isImmuneGlobulinProposed() {
+		return immuneGlobulinProposed;
+	}
+
+	public void setImmuneGlobulinProposed(boolean immuneGlobulinProposed) {
+		this.immuneGlobulinProposed = immuneGlobulinProposed;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactProximity.java

@@ -89,6 +89,7 @@ public static ContactProximity[] getValues(Disease disease, String serverLocale)
 		if(disease != null && serverLocale != null && StringUtils.endsWithIgnoreCase(serverLocale,CountryHelper.COUNTRY_CODE_LUXEMBOURG)){
 			switch (disease) {
 				case INVASIVE_MENINGOCOCCAL_INFECTION:
+				case MEASLES:
 					return new ContactProximity[] {
 							PHYSICAL_CONTACT,
 							CLOSE_CONTACT,

sormas-api/src/main/java/de/symeda/sormas/api/epidata/CaseImportedStatus.java

@@ -0,0 +1,29 @@
+/*
+ * 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.epidata;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum CaseImportedStatus {
+    IMPORTED_CASE,
+    IMPORT_RELATED_CASE,
+    UNKNOWN_IMPORTATION_STATUS,
+    NOT_IMPORTED_CASE;
+
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
+}

sormas-api/src/main/java/de/symeda/sormas/api/epidata/ClusterType.java

@@ -0,0 +1,34 @@
+/*
+ * 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.epidata;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ClusterType {
+    KINDERGARTEN_OR_CHILDCARE,
+    FAMILY,
+    MILITARY,
+    NOSOCOMIAL,
+    SCHOOL,
+    SPORTS_TEAM,
+    UNIVERSITY,
+    OTHER;
+
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
+
+}

sormas-api/src/main/java/de/symeda/sormas/api/epidata/EpiDataDto.java

@@ -22,6 +22,7 @@
 
 import javax.validation.Valid;
 
+import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.ImportIgnore;
 import de.symeda.sormas.api.activityascase.ActivityAsCaseDto;
@@ -31,6 +32,7 @@
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.DependingOnFeatureType;
 import de.symeda.sormas.api.utils.Diseases;
+import de.symeda.sormas.api.utils.HideForCountriesExcept;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
 
@@ -51,12 +53,29 @@ public class EpiDataDto extends PseudonymizableDto {
 	public static final String AREA_INFECTED_ANIMALS = "areaInfectedAnimals";
 	public static final String HIGH_TRANSMISSION_RISK_AREA = "highTransmissionRiskArea";
 	public static final String LARGE_OUTBREAKS_AREA = "largeOutbreaksArea";
+	public static final String CASE_IMPORTED_STATUS = "caseImportedStatus";
+	public static final String CLUSTER_TYPE = "clusterType";
+	public static final String CLUSTER_TYPE_TEXT = "clusterTypeText";
 
 	private YesNoUnknown exposureDetailsKnown;
 	private YesNoUnknown activityAsCaseDetailsKnown;
 	private YesNoUnknown contactWithSourceCaseKnown;
 	private YesNoUnknown highTransmissionRiskArea;
 	private YesNoUnknown largeOutbreaksArea;
+	@Diseases({
+			Disease.MEASLES})
+	@HideForCountriesExcept(countries = {CountryHelper.COUNTRY_CODE_LUXEMBOURG})
+	private CaseImportedStatus caseImportedStatus;
+	@Diseases({
+			Disease.MEASLES})
+	@HideForCountriesExcept(countries = {CountryHelper.COUNTRY_CODE_LUXEMBOURG})
+	private ClusterType clusterType;
+
+	@HideForCountriesExcept(countries = {CountryHelper.COUNTRY_CODE_LUXEMBOURG})
+	@Diseases({
+			Disease.MEASLES})
+	private String clusterTypeText;
+
 	@Diseases({
 		Disease.AFP,
 		Disease.GUINEA_WORM,
@@ -146,6 +165,30 @@ public static EpiDataDto build() {
 		return epiData;
 	}
 
+	public CaseImportedStatus getCaseImportedStatus() {
+		return caseImportedStatus;
+	}
+
+	public void setCaseImportedStatus(CaseImportedStatus caseImportedStatus) {
+		this.caseImportedStatus = caseImportedStatus;
+	}
+
+	public ClusterType getClusterType() {
+		return clusterType;
+	}
+
+	public void setClusterType(ClusterType clusterType) {
+		this.clusterType = clusterType;
+	}
+
+	public String getClusterTypeText() {
+		return clusterTypeText;
+	}
+
+	public void setClusterTypeText(String clusterTypeText) {
+		this.clusterTypeText = clusterTypeText;
+	}
+
 	@Override
 	public EpiDataDto clone() throws CloneNotSupportedException {
 		EpiDataDto clone = (EpiDataDto) super.clone();

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

@@ -11,6 +11,7 @@
 import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto;
+import de.symeda.sormas.api.sample.GenoTypeResult;
 import de.symeda.sormas.api.sample.PCRTestSpecification;
 import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.sample.PathogenTestType;
@@ -130,6 +131,8 @@ public class TestReportDto extends EntityDto {
 	private String prescriberCity;
 	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_LUXEMBOURG)
 	private CountryReferenceDto prescriberCountry;
+	@HideForCountriesExcept(countries = CountryHelper.COUNTRY_CODE_LUXEMBOURG)
+	private GenoTypeResult genoTypeResult;
 
 	public SampleReportReferenceDto getSampleReport() {
 		return sampleReport;
@@ -408,4 +411,12 @@ public CountryReferenceDto getPrescriberCountry() {
 	public void setPrescriberCountry(CountryReferenceDto prescriberCountry) {
 		this.prescriberCountry = prescriberCountry;
 	}
+
+	public GenoTypeResult getGenoTypeResult() {
+		return genoTypeResult;
+	}
+
+	public void setGenoTypeResult(GenoTypeResult genoTypeResult) {
+		this.genoTypeResult = genoTypeResult;
+	}
 }

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

@@ -334,7 +334,12 @@ public List<String[]> mapToPathogenTest(TestReportDto sourceTestReport, Pathogen
 							pathogenTest::setPrescriberCountry,
 							pathogenTest.getPrescriberCountry(),
 							sourceTestReport.getPrescriberCountry(),
-							PathogenTestDto.PRESCRIBER_COUNTRY))));
+								PathogenTestDto.PRESCRIBER_COUNTRY),
+							Mapping.of(
+									pathogenTest::setGenoTypeResult,
+									pathogenTest.getGenoTypeResult(),
+									sourceTestReport.getGenoTypeResult(),
+									PathogenTestDto.GENOTYPE_RESULT))));
 		}
 
 		changedFields.addAll(

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

@@ -1043,6 +1043,7 @@ public interface Captions {
 	String Contact_followUpStatusChangeUser = "Contact.followUpStatusChangeUser";
 	String Contact_followUpUntil = "Contact.followUpUntil";
 	String Contact_highPriority = "Contact.highPriority";
+	String Contact_immuneGlobulinProposed = "Contact.immuneGlobulinProposed";
 	String Contact_immunosuppressiveTherapyBasicDisease = "Contact.immunosuppressiveTherapyBasicDisease";
 	String Contact_immunosuppressiveTherapyBasicDiseaseDetails = "Contact.immunosuppressiveTherapyBasicDiseaseDetails";
 	String Contact_internalToken = "Contact.internalToken";
@@ -1098,6 +1099,9 @@ public interface Captions {
 	String Contact_tracingApp = "Contact.tracingApp";
 	String Contact_tracingAppDetails = "Contact.tracingAppDetails";
 	String Contact_uuid = "Contact.uuid";
+	String Contact_vaccinationDoseOneDate = "Contact.vaccinationDoseOneDate";
+	String Contact_vaccinationDoseTwoDate = "Contact.vaccinationDoseTwoDate";
+	String Contact_vaccinationProposed = "Contact.vaccinationProposed";
 	String Contact_vaccinationStatus = "Contact.vaccinationStatus";
 	String Contact_visits = "Contact.visits";
 	String contactActiveContacts = "contactActiveContacts";
@@ -1556,6 +1560,9 @@ public interface Captions {
 	String EpiData_activitiesAsCase = "EpiData.activitiesAsCase";
 	String EpiData_activityAsCaseDetailsKnown = "EpiData.activityAsCaseDetailsKnown";
 	String EpiData_areaInfectedAnimals = "EpiData.areaInfectedAnimals";
+	String EpiData_caseImportedStatus = "EpiData.caseImportedStatus";
+	String EpiData_clusterType = "EpiData.clusterType";
+	String EpiData_clusterTypeText = "EpiData.clusterTypeText";
 	String EpiData_contactWithSourceCaseKnown = "EpiData.contactWithSourceCaseKnown";
 	String EpiData_exposureDetailsKnown = "EpiData.exposureDetailsKnown";
 	String EpiData_exposures = "EpiData.exposures";
@@ -2228,6 +2235,8 @@ public interface Captions {
 	String PathogenTest_externalId = "PathogenTest.externalId";
 	String PathogenTest_externalOrderId = "PathogenTest.externalOrderId";
 	String PathogenTest_fourFoldIncreaseAntibodyTiter = "PathogenTest.fourFoldIncreaseAntibodyTiter";
+	String PathogenTest_genoTypeResult = "PathogenTest.genoTypeResult";
+	String PathogenTest_genoTypeResultText = "PathogenTest.genoTypeResultText";
 	String PathogenTest_isoniazidResistant = "PathogenTest.isoniazidResistant";
 	String PathogenTest_lab = "PathogenTest.lab";
 	String PathogenTest_labDetails = "PathogenTest.labDetails";
@@ -2810,6 +2819,7 @@ public interface Captions {
 	String Symptoms = "Symptoms";
 	String Symptoms_abdominalPain = "Symptoms.abdominalPain";
 	String Symptoms_abnormalLungXrayFindings = "Symptoms.abnormalLungXrayFindings";
+	String Symptoms_acuteEncephalitis = "Symptoms.acuteEncephalitis";
 	String Symptoms_acuteRespiratoryDistressSyndrome = "Symptoms.acuteRespiratoryDistressSyndrome";
 	String Symptoms_aerophobia = "Symptoms.aerophobia";
 	String Symptoms_agitation = "Symptoms.agitation";
@@ -2997,6 +3007,8 @@ public interface Captions {
 	String Symptoms_sidePain = "Symptoms.sidePain";
 	String Symptoms_skinBruising = "Symptoms.skinBruising";
 	String Symptoms_skinRash = "Symptoms.skinRash";
+	String Symptoms_skinRash_lu_MEASLES = "Symptoms.skinRash.lu-MEASLES";
+	String Symptoms_skinRashOnsetDate = "Symptoms.skinRashOnsetDate";
 	String Symptoms_skinUlcers = "Symptoms.skinUlcers";
 	String Symptoms_soreThroat = "Symptoms.soreThroat";
 	String Symptoms_splenomegaly = "Symptoms.splenomegaly";

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

@@ -498,6 +498,7 @@ public interface Strings {
 	String headingClinicalMeasurements = "headingClinicalMeasurements";
 	String headingClinicalPresentation = "headingClinicalPresentation";
 	String headingClinicalVisitsDeleted = "headingClinicalVisitsDeleted";
+	String headingClusterType = "headingClusterType";
 	String headingComparisonCase = "headingComparisonCase";
 	String headingCompleteness = "headingCompleteness";
 	String headingComplications = "headingComplications";
@@ -637,6 +638,7 @@ public interface Strings {
 	String headingEnvironmentSamplesNotDeleted = "headingEnvironmentSamplesNotDeleted";
 	String headingEnvironmentSamplesNotRestored = "headingEnvironmentSamplesNotRestored";
 	String headingEnvironmentSamplesRestored = "headingEnvironmentSamplesRestored";
+	String headingEpiCaseImport = "headingEpiCaseImport";
 	String headingEpiCurve = "headingEpiCurve";
 	String headingEpiDataSourceCaseContacts = "headingEpiDataSourceCaseContacts";
 	String headingErrorReportNotAvailable = "headingErrorReportNotAvailable";