Merge pull request #13331 from SORMAS-Foundation/13319-enhance-case-data-form-for-tb-specific-data

13319 enhance case data form for tb specific data

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/Disease.java

@@ -57,7 +57,7 @@ public enum Disease
 	DIARRHEA_BLOOD(true, false, false, true, false, 0, true, false, false),
 	SNAKE_BITE(true, false, false, true, false, 0, true, false, false),
 	RUBELLA(true, false, false, true, false, 0, true, false, false),
-	TUBERCULOSIS(true, false, false, true, false, 0, true, false, false),
+	TUBERCULOSIS(true, true, true, true, false, 0, true, false, false),
 	LEPROSY(true, false, false, true, false, 0, true, false, false),
 	LYMPHATIC_FILARIASIS(true, false, false, true, false, 0, true, false, false),
 	BURULI_ULCER(true, false, false, true, false, 0, true, false, false),

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

@@ -17,6 +17,7 @@
 
 import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_FRANCE;
 import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_GERMANY;
+import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_LUXEMBOURG;
 import static de.symeda.sormas.api.CountryHelper.COUNTRY_CODE_SWITZERLAND;
 import static de.symeda.sormas.api.utils.FieldConstraints.CHARACTER_LIMIT_BIG;
 
@@ -228,6 +229,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	public static final String EXTERNAL_DATA = "externalData";
 	public static final String DELETION_REASON = "deletionReason";
 	public static final String OTHER_DELETION_REASON = "otherDeletionReason";
+	public static final String POST_MORTEM = "postMortem";
+	public static final String DEPARTMENT = "department";
 
 	public static final String NOTIFIER = "notifier";
 
@@ -272,18 +275,21 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@HideForCountries(countries = {
 		COUNTRY_CODE_FRANCE,
 		COUNTRY_CODE_GERMANY,
-		COUNTRY_CODE_SWITZERLAND })
+		COUNTRY_CODE_SWITZERLAND,
+		COUNTRY_CODE_LUXEMBOURG })
 	private Date regionLevelDate;
 	@HideForCountries(countries = {
 		COUNTRY_CODE_FRANCE,
 		COUNTRY_CODE_GERMANY,
-		COUNTRY_CODE_SWITZERLAND })
+		COUNTRY_CODE_SWITZERLAND,
+		COUNTRY_CODE_LUXEMBOURG })
 	private Date nationalLevelDate;
 	@Outbreaks
 	@HideForCountries(countries = {
 		COUNTRY_CODE_FRANCE,
 		COUNTRY_CODE_GERMANY,
-		COUNTRY_CODE_SWITZERLAND })
+		COUNTRY_CODE_SWITZERLAND,
+		COUNTRY_CODE_LUXEMBOURG })
 	private Date districtLevelDate;
 	@Outbreaks
 	@Diseases(value = Disease.RESPIRATORY_SYNCYTIAL_VIRUS, hide = true)
@@ -355,7 +361,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@EmbeddedSensitiveData
 	@SensitiveData
 	private HealthConditionsDto healthConditions;
-
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	private YesNoUnknown pregnant;
 	@Diseases({
 		Disease.AFP,
@@ -371,6 +378,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 		Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
 		Disease.OTHER })
 	@Outbreaks
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	private VaccinationStatus vaccinationStatus;
 	@Diseases({
 		Disease.MONKEYPOX })
@@ -383,18 +392,26 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	private Date smallpoxLastVaccinationDate;
 	@Outbreaks
 	@SensitiveData
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	private UserReferenceDto surveillanceOfficer;
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	@DependingOnUserRight(UserRight.CASE_CLINICIAN_VIEW)
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	private String clinicianName;
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	@DependingOnUserRight(UserRight.CASE_CLINICIAN_VIEW)
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	private String clinicianPhone;
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	@DependingOnUserRight(UserRight.CASE_CLINICIAN_VIEW)
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	private String clinicianEmail;
 	@Diseases({
 		Disease.CONGENITAL_RUBELLA })
@@ -450,6 +467,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@S2SIgnoreProperty(configProperty = SormasToSormasConfig.SORMAS2SORMAS_IGNORE_ADDITIONAL_DETAILS)
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	private String additionalDetails;
 	@HideForCountriesExcept(countries = {
 		COUNTRY_CODE_GERMANY,
@@ -518,6 +537,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 		COUNTRY_CODE_GERMANY,
 		COUNTRY_CODE_SWITZERLAND })
 	private Date quarantineOfficialOrderSentDate;
+	@HideForCountries(countries = {
+		COUNTRY_CODE_LUXEMBOURG })
 	@SensitiveData
 	private YesNoUnknown postpartum;
 	@SensitiveData
@@ -623,6 +644,12 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String otherDeletionReason;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_LUXEMBOURG)
+	@Diseases(value = {
+		Disease.TUBERCULOSIS })
+	private boolean postMortem;
+	@HideForCountriesExcept(countries = COUNTRY_CODE_LUXEMBOURG)
+	private String department;
 
 	private NotifierReferenceDto notifier;
 
@@ -1790,6 +1817,22 @@ public void setNotifier(NotifierReferenceDto notifier) {
 		this.notifier = notifier;
 	}
 
+	public boolean isPostMortem() {
+		return postMortem;
+	}
+
+	public void setPostMortem(boolean postMortem) {
+		this.postMortem = postMortem;
+	}
+
+	public String getDepartment() {
+		return department;
+	}
+
+	public void setDepartment(String department) {
+		this.department = department;
+	}
+
 	@JsonIgnore
 	public String i18nPrefix() {
 		return I18N_PREFIX;

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

@@ -0,0 +1,33 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2021 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * 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.clinicalcourse;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum ComplianceWithTreatment {
+
+	NO_COMPLIANCE,
+	TREATMENT_COMPLETED,
+	TREATMENT_FAILED,
+	TREATMENT_NOT_COMPLETED,
+	UNKNOWN,
+	NOT_APPLICABLE;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -3,10 +3,12 @@
 import javax.validation.constraints.Size;
 
 import de.symeda.sormas.api.CountryHelper;
+import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Validations;
 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.FieldConstraints;
 import de.symeda.sormas.api.utils.HideForCountries;
 import de.symeda.sormas.api.utils.HideForCountriesExcept;
@@ -48,6 +50,9 @@ public class HealthConditionsDto extends PseudonymizableDto {
 	public static final String ASTHMA = "asthma";
 	public static final String SICKLE_CELL_DISEASE = "sickleCellDisease";
 	public static final String IMMUNODEFICIENCY_INCLUDING_HIV = "immunodeficiencyIncludingHiv";
+	public static final String TUBERCULOSIS_INFECTION_YEAR = "tuberculosisInfectionYear";
+	public static final String PREVIOUS_TUBERCULOSIS_TREATMENT = "previousTuberculosisTreatment";
+	public static final String COMPLIANCE_WITH_TREATMENT = "complianceWithTreatment";
 
 	@HideForCountries(countries = {
 		CountryHelper.COUNTRY_CODE_GERMANY,
@@ -119,6 +124,21 @@ public class HealthConditionsDto extends PseudonymizableDto {
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_BIG, message = Validations.textTooLong)
 	private String otherConditions;
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	@Diseases(value = {
+		Disease.TUBERCULOSIS })
+	private YesNoUnknown previousTuberculosisTreatment;
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	@Diseases(value = {
+		Disease.TUBERCULOSIS })
+	private Integer tuberculosisInfectionYear;
+	@HideForCountriesExcept(countries = {
+		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
+	@Diseases(value = {
+		Disease.TUBERCULOSIS })
+	private ComplianceWithTreatment complianceWithTreatment;
 
 	public static HealthConditionsDto build() {
 		HealthConditionsDto healthConditions = new HealthConditionsDto();
@@ -180,7 +200,7 @@ public void setImmunodeficiencyIncludingHiv(YesNoUnknown immunodeficiencyIncludi
 		this.immunodeficiencyIncludingHiv = immunodeficiencyIncludingHiv;
 	}
 
-	@Order(10)
+	@Order(32)
 	public YesNoUnknown getHiv() {
 		return hiv;
 	}
@@ -332,4 +352,29 @@ public String getOtherConditions() {
 	public void setOtherConditions(String otherConditions) {
 		this.otherConditions = otherConditions;
 	}
+
+	@Order(10)
+	public YesNoUnknown getPreviousTuberculosisTreatment() {
+		return previousTuberculosisTreatment;
+	}
+
+	public void setPreviousTuberculosisTreatment(YesNoUnknown previousTuberculosisTreatment) {
+		this.previousTuberculosisTreatment = previousTuberculosisTreatment;
+	}
+
+	public Integer getTuberculosisInfectionYear() {
+		return tuberculosisInfectionYear;
+	}
+
+	public void setTuberculosisInfectionYear(Integer tuberculosisInfectionYear) {
+		this.tuberculosisInfectionYear = tuberculosisInfectionYear;
+	}
+
+	public ComplianceWithTreatment getComplianceWithTreatment() {
+		return complianceWithTreatment;
+	}
+
+	public void setComplianceWithTreatment(ComplianceWithTreatment complianceWithTreatment) {
+		this.complianceWithTreatment = complianceWithTreatment;
+	}
 }

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

@@ -678,6 +678,7 @@ public interface Captions {
 	String CaseData_creationDate = "CaseData.creationDate";
 	String CaseData_deletionReason = "CaseData.deletionReason";
 	String CaseData_dengueFeverType = "CaseData.dengueFeverType";
+	String CaseData_department = "CaseData.department";
 	String CaseData_differentPlaceOfStayJurisdiction = "CaseData.differentPlaceOfStayJurisdiction";
 	String CaseData_differentPointOfEntryJurisdiction = "CaseData.differentPointOfEntryJurisdiction";
 	String CaseData_diseaseDetails = "CaseData.diseaseDetails";
@@ -743,6 +744,7 @@ public interface Captions {
 	String CaseData_pointOfEntryName = "CaseData.pointOfEntryName";
 	String CaseData_pointOfEntryRegion = "CaseData.pointOfEntryRegion";
 	String CaseData_portHealthInfo = "CaseData.portHealthInfo";
+	String CaseData_postMortem = "CaseData.postMortem";
 	String CaseData_postpartum = "CaseData.postpartum";
 	String CaseData_pregnant = "CaseData.pregnant";
 	String CaseData_previousInfectionDate = "CaseData.previousInfectionDate";
@@ -1935,6 +1937,7 @@ public interface Captions {
 	String HealthConditions_chronicLiverDisease = "HealthConditions.chronicLiverDisease";
 	String HealthConditions_chronicNeurologicCondition = "HealthConditions.chronicNeurologicCondition";
 	String HealthConditions_chronicPulmonaryDisease = "HealthConditions.chronicPulmonaryDisease";
+	String HealthConditions_complianceWithTreatment = "HealthConditions.complianceWithTreatment";
 	String HealthConditions_congenitalSyphilis = "HealthConditions.congenitalSyphilis";
 	String HealthConditions_currentSmoker = "HealthConditions.currentSmoker";
 	String HealthConditions_diabetes = "HealthConditions.diabetes";
@@ -1948,8 +1951,10 @@ public interface Captions {
 	String HealthConditions_malignancyChemotherapy = "HealthConditions.malignancyChemotherapy";
 	String HealthConditions_obesity = "HealthConditions.obesity";
 	String HealthConditions_otherConditions = "HealthConditions.otherConditions";
+	String HealthConditions_previousTuberculosisTreatment = "HealthConditions.previousTuberculosisTreatment";
 	String HealthConditions_sickleCellDisease = "HealthConditions.sickleCellDisease";
 	String HealthConditions_tuberculosis = "HealthConditions.tuberculosis";
+	String HealthConditions_tuberculosisInfectionYear = "HealthConditions.tuberculosisInfectionYear";
 	String humanSampleViewType = "humanSampleViewType";
 	String Immunization = "Immunization";
 	String Immunization_additionalDetails = "Immunization.additionalDetails";
@@ -2254,6 +2259,7 @@ public interface Captions {
 	String Person_educationType = "Person.educationType";
 	String Person_emailAddress = "Person.emailAddress";
 	String Person_emancipated = "Person.emancipated";
+	String Person_entryDate = "Person.entryDate";
 	String Person_externalId = "Person.externalId";
 	String Person_externalToken = "Person.externalToken";
 	String Person_fathersName = "Person.fathersName";
@@ -2264,6 +2270,7 @@ public interface Captions {
 	String Person_incapacitated = "Person.incapacitated";
 	String Person_internalToken = "Person.internalToken";
 	String Person_lastDisease = "Person.lastDisease";
+	String Person_livingStatus = "Person.livingStatus";
 	String Person_matchingCase = "Person.matchingCase";
 	String Person_mothersMaidenName = "Person.mothersMaidenName";
 	String Person_mothersName = "Person.mothersName";

sormas-api/src/main/java/de/symeda/sormas/api/person/LivingStatus.java

@@ -0,0 +1,30 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2026 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * 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.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+public enum LivingStatus {
+
+	MIGRANT,
+	FOREIGNER,
+	HOMELESS,
+	REGISTERED_AT_A_RESIDENCE;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}