Merge pull request #13565 from SORMAS-Foundation/feature-13538-rsv_enhancements_epidata

#13538 - Updated RSV EpiData

Author: raulbob

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

@@ -98,6 +98,8 @@ public class ExposureDto extends PseudonymizableDto {
 	public static final String HABITATION_DETAILS = "habitationDetails";
 	public static final String TYPE_OF_ANIMAL = "typeOfAnimal";
 	public static final String TYPE_OF_ANIMAL_DETAILS = "typeOfAnimalDetails";
+	public static final String TYPE_OF_CHILDCARE_FACILITY = "typeOfChildcareFacility";
+	public static final String CHILDCARE_FACILITY_DETAILS = "childcareFacilityDetails";
 	public static final String PHYSICAL_CONTACT_DURING_PREPARATION = "physicalContactDuringPreparation";
 	public static final String PHYSICAL_CONTACT_WITH_BODY = "physicalContactWithBody";
 	public static final String DECEASED_PERSON_ILL = "deceasedPersonIll";
@@ -262,6 +264,14 @@ public class ExposureDto extends PseudonymizableDto {
 	@SensitiveData
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
 	private String typeOfAnimalDetails;
+	@Diseases({
+		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
+	private TypeOfChildcareFacility typeOfChildcareFacility;
+	@SensitiveData
+	@Diseases({
+		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
+	@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
+	private String childcareFacilityDetails;
 
 	// Fields specific to ExposureType.BURIAL
 	private YesNoUnknown physicalContactDuringPreparation;
@@ -581,6 +591,22 @@ public void setTypeOfAnimalDetails(String typeOfAnimalDetails) {
 		this.typeOfAnimalDetails = typeOfAnimalDetails;
 	}
 
+	public TypeOfChildcareFacility getTypeOfChildcareFacility() {
+		return typeOfChildcareFacility;
+	}
+
+	public void setTypeOfChildcareFacility(TypeOfChildcareFacility typeOfChildcareFacility) {
+		this.typeOfChildcareFacility = typeOfChildcareFacility;
+	}
+
+	public String getChildcareFacilityDetails() {
+		return childcareFacilityDetails;
+	}
+
+	public void setChildcareFacilityDetails(String childcareFacilityDetails) {
+		this.childcareFacilityDetails = childcareFacilityDetails;
+	}
+
 	public YesNoUnknown getPhysicalContactDuringPreparation() {
 		return physicalContactDuringPreparation;
 	}

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

@@ -28,6 +28,9 @@ public enum ExposureType {
 	GATHERING,
 	HABITATION,
 	PERSONAL_SERVICES,
+	@Diseases(value = {
+		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
+	CHILDCARE_FACILITY,
 	@Diseases(value = {
 		Disease.CORONAVIRUS }, hide = true)
 	BURIAL,

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

@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+public enum TypeOfChildcareFacility {
+
+	NURSERY_CRECHE,
+	NURSERY_SCHOOL,
+	CHILDMINDER_CENTER,
+	CHILDCARE_CENTER,
+	SCHOOL,
+	OTHER;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

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

@@ -1788,6 +1788,7 @@ public interface Captions {
 	String Exposure_animalMarket = "Exposure.animalMarket";
 	String Exposure_animalVaccinated = "Exposure.animalVaccinated";
 	String Exposure_bodyOfWater = "Exposure.bodyOfWater";
+	String Exposure_childcareFacilityDetails = "Exposure.childcareFacilityDetails";
 	String Exposure_connectionNumber = "Exposure.connectionNumber";
 	String Exposure_contactToBodyFluids = "Exposure.contactToBodyFluids";
 	String Exposure_contactToCase = "Exposure.contactToCase";
@@ -1829,6 +1830,7 @@ public interface Captions {
 	String Exposure_startDate = "Exposure.startDate";
 	String Exposure_typeOfAnimal = "Exposure.typeOfAnimal";
 	String Exposure_typeOfAnimalDetails = "Exposure.typeOfAnimalDetails";
+	String Exposure_typeOfChildcareFacility = "Exposure.typeOfChildcareFacility";
 	String Exposure_typeOfPlace = "Exposure.typeOfPlace";
 	String Exposure_typeOfPlaceDetails = "Exposure.typeOfPlaceDetails";
 	String Exposure_waterSource = "Exposure.waterSource";

sormas-api/src/main/resources/captions.properties

@@ -1536,6 +1536,8 @@ Exposure.habitationType=Type of habitation
 Exposure.habitationDetails=Type of habitation details
 Exposure.typeOfAnimal=Type of animal
 Exposure.typeOfAnimalDetails=Type of animal details
+Exposure.typeOfChildcareFacility=Type of childcare facility
+Exposure.childcareFacilityDetails=Type of childcare facility details
 Exposure.physicalContactDuringPreparation=Has had direct physical contact during burial preparation ritual
 Exposure.physicalContactWithBody=Has had direct physical contact with the (deceased) case at a funeral
 Exposure.deceasedPersonIll=Was the deceased person ill?

sormas-api/src/main/resources/enum.properties

@@ -742,6 +742,7 @@ ExposureType.VISIT=Visit
 ExposureType.GATHERING=Gathering
 ExposureType.HABITATION=Habitation
 ExposureType.PERSONAL_SERVICES=Personal Services
+ExposureType.CHILDCARE_FACILITY=Childcare Facility
 ExposureType.BURIAL=Burial
 ExposureType.ANIMAL_CONTACT=Animal Contact
 ExposureType.OTHER=Other
@@ -1451,6 +1452,13 @@ TypeOfAnimal.FLEA=Flea
 TypeOfAnimal.TICK=Tick
 TypeOfAnimal.OTHER=Other
 
+TypeOfChildcareFacility.NURSERY_CRECHE=Nursery/Creche
+TypeOfChildcareFacility.NURSERY_SCHOOL=Nursery School
+TypeOfChildcareFacility.CHILDMINDER_CENTER=Childminder Centre
+TypeOfChildcareFacility.CHILDCARE_CENTER=Childcare Centre
+TypeOfChildcareFacility.SCHOOL=School
+TypeOfChildcareFacility.OTHER=Other
+
 # TypeOfDrug
 TypeOfDrug.ANTIMICROBIAL = Antimicrobial
 TypeOfDrug.ANTIVIRAL = Antiviral

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java

@@ -119,6 +119,8 @@ public Exposure fillOrBuildExposureEntity(ExposureDto source, Exposure target, b
 		target.setAnimalCondition(source.getAnimalCondition());
 		target.setTypeOfAnimal(source.getTypeOfAnimal());
 		target.setTypeOfAnimalDetails(source.getTypeOfAnimalDetails());
+		target.setTypeOfChildcareFacility(source.getTypeOfChildcareFacility());
+		target.setChildcareFacilityDetails(source.getChildcareFacilityDetails());
 		target.setAnimalContactType(source.getAnimalContactType());
 		target.setAnimalContactTypeDetails(source.getAnimalContactTypeDetails());
 		target.setAnimalMarket(source.getAnimalMarket());
@@ -258,6 +260,8 @@ public static ExposureDto toExposureDto(Exposure source) {
 		target.setAnimalCondition(source.getAnimalCondition());
 		target.setTypeOfAnimal(source.getTypeOfAnimal());
 		target.setTypeOfAnimalDetails(source.getTypeOfAnimalDetails());
+		target.setTypeOfChildcareFacility(source.getTypeOfChildcareFacility());
+		target.setChildcareFacilityDetails(source.getChildcareFacilityDetails());
 		target.setAnimalContactType(source.getAnimalContactType());
 		target.setAnimalContactTypeDetails(source.getAnimalContactTypeDetails());
 		target.setAnimalMarket(source.getAnimalMarket());

sormas-backend/src/main/java/de/symeda/sormas/backend/exposure/Exposure.java

@@ -41,6 +41,7 @@
 import de.symeda.sormas.api.exposure.GatheringType;
 import de.symeda.sormas.api.exposure.HabitationType;
 import de.symeda.sormas.api.exposure.TypeOfAnimal;
+import de.symeda.sormas.api.exposure.TypeOfChildcareFacility;
 import de.symeda.sormas.api.exposure.WorkEnvironment;
 import de.symeda.sormas.api.utils.YesNoUnknown;
 import de.symeda.sormas.backend.common.AbstractDomainObject;
@@ -116,6 +117,8 @@ public class Exposure extends AbstractDomainObject {
 	private String habitationDetails;
 	private TypeOfAnimal typeOfAnimal;
 	private String typeOfAnimalDetails;
+	private TypeOfChildcareFacility typeOfChildcareFacility;
+	private String childcareFacilityDetails;
 
 	// Fields specific to ExposureType.BURIAL
 	private YesNoUnknown physicalContactDuringPreparation;
@@ -477,6 +480,24 @@ public void setTypeOfAnimalDetails(String typeOfAnimalDetails) {
 		this.typeOfAnimalDetails = typeOfAnimalDetails;
 	}
 
+	@Enumerated(EnumType.STRING)
+	public TypeOfChildcareFacility getTypeOfChildcareFacility() {
+		return typeOfChildcareFacility;
+	}
+
+	public void setTypeOfChildcareFacility(TypeOfChildcareFacility typeOfChildcareFacility) {
+		this.typeOfChildcareFacility = typeOfChildcareFacility;
+	}
+
+	@Column(columnDefinition = "text")
+	public String getChildcareFacilityDetails() {
+		return childcareFacilityDetails;
+	}
+
+	public void setChildcareFacilityDetails(String childcareFacilityDetails) {
+		this.childcareFacilityDetails = childcareFacilityDetails;
+	}
+
 	@Enumerated(EnumType.STRING)
 	public YesNoUnknown getPhysicalContactDuringPreparation() {
 		return physicalContactDuringPreparation;

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -14505,4 +14505,14 @@ ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS timeOffWorkDays varchar(25
 
 INSERT INTO schema_version (version_number, comment) VALUES (583, 'Update symptoms for RSV #13544');
 
+-- 2025-08-05 RSV EpiData updates #13538
+
+ALTER TABLE exposures ADD COLUMN IF NOT EXISTS typeOfChildcareFacility varchar(255);
+ALTER TABLE exposures ADD COLUMN IF NOT EXISTS childcareFacilityDetails varchar(255);
+
+ALTER TABLE exposures_history ADD COLUMN IF NOT EXISTS typeOfChildcareFacility varchar(255);
+ALTER TABLE exposures_history ADD COLUMN IF NOT EXISTS childcareFacilityDetails varchar(255);
+
+INSERT INTO schema_version (version_number, comment) VALUES (584, 'RSV EpiData updates #13538');
+
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***

sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposureForm.java

@@ -51,6 +51,7 @@
 import de.symeda.sormas.api.exposure.GatheringType;
 import de.symeda.sormas.api.exposure.HabitationType;
 import de.symeda.sormas.api.exposure.TypeOfAnimal;
+import de.symeda.sormas.api.exposure.TypeOfChildcareFacility;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
@@ -86,14 +87,16 @@ public class ExposureForm extends AbstractEditForm<ExposureDto> {
 							ExposureDto.EXPOSURE_TYPE_DETAILS,
 							ExposureDto.GATHERING_TYPE,
 							ExposureDto.HABITATION_TYPE,
-							ExposureDto.TYPE_OF_ANIMAL
+							ExposureDto.TYPE_OF_ANIMAL,
+							ExposureDto.TYPE_OF_CHILDCARE_FACILITY
 					))
 			) +
 			fluidRow(
 					fluidColumn(12, 0, locs(
 							ExposureDto.GATHERING_DETAILS,
 							ExposureDto.HABITATION_DETAILS,
-							ExposureDto.TYPE_OF_ANIMAL_DETAILS
+							ExposureDto.TYPE_OF_ANIMAL_DETAILS,
+							ExposureDto.CHILDCARE_FACILITY_DETAILS
 					))
 			) +
 			loc(LOC_EXPOSURE_DETAILS_HEADING) +
@@ -224,9 +227,11 @@ private void addBasicFields() {
 			ExposureDto.GATHERING_TYPE,
 			ExposureDto.HABITATION_TYPE,
 			ExposureDto.TYPE_OF_ANIMAL,
+			ExposureDto.TYPE_OF_CHILDCARE_FACILITY,
 			ExposureDto.GATHERING_DETAILS,
 			ExposureDto.HABITATION_DETAILS,
 			ExposureDto.TYPE_OF_ANIMAL_DETAILS,
+			ExposureDto.CHILDCARE_FACILITY_DETAILS,
 			ExposureDto.PHYSICAL_CONTACT_DURING_PREPARATION,
 			ExposureDto.PHYSICAL_CONTACT_WITH_BODY,
 			ExposureDto.DECEASED_PERSON_NAME,
@@ -276,9 +281,11 @@ private void setUpVisibilityDependencies() {
 		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.GATHERING_TYPE, ExposureDto.EXPOSURE_TYPE, ExposureType.GATHERING, true);
 		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.HABITATION_TYPE, ExposureDto.EXPOSURE_TYPE, ExposureType.HABITATION, true);
 		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.TYPE_OF_ANIMAL, ExposureDto.EXPOSURE_TYPE, ExposureType.ANIMAL_CONTACT, true);
+		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.TYPE_OF_CHILDCARE_FACILITY, ExposureDto.EXPOSURE_TYPE, ExposureType.CHILDCARE_FACILITY, true);
 		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.GATHERING_DETAILS, ExposureDto.GATHERING_TYPE, GatheringType.OTHER, true);
 		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.HABITATION_DETAILS, ExposureDto.HABITATION_TYPE, HabitationType.OTHER, true);
 		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.TYPE_OF_ANIMAL_DETAILS, ExposureDto.TYPE_OF_ANIMAL, TypeOfAnimal.OTHER, true);
+		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.CHILDCARE_FACILITY_DETAILS, ExposureDto.TYPE_OF_CHILDCARE_FACILITY, TypeOfChildcareFacility.OTHER, true);
 		FieldHelper.setVisibleWhen(getFieldGroup(), ExposureDto.LARGE_ATTENDANCE_NUMBER, ExposureDto.EXPOSURE_TYPE, ExposureType.GATHERING, true);
 		FieldHelper.setVisibleWhen(
 			getFieldGroup(),