#13539 - Updated person form with new RSV fields

raulbob · raulbob · commit 25ab1e81e485 · 2025-08-13T11:41:06.000+02:00
- Added new fields for birth weight category, gestational age category, and multiple birth status to the person form.
- Added `GestationalAgeCategory`, `BirthWeightCategory`, and `MultipleBirth` enums.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -2294,6 +2294,8 @@ public interface Captions {
 	String Person_birthdateYYYY = "Person.birthdateYYYY";
 	String Person_birthName = "Person.birthName";
 	String Person_birthWeight = "Person.birthWeight";
+	String Person_birthWeightCategory = "Person.birthWeightCategory";
+	String Person_birthWeightValue = "Person.birthWeightValue";
 	String Person_burialConductor = "Person.burialConductor";
 	String Person_burialDate = "Person.burialDate";
 	String Person_burialPlaceDescription = "Person.burialPlaceDescription";
@@ -2317,6 +2319,7 @@ public interface Captions {
 	String Person_fathersName = "Person.fathersName";
 	String Person_generalPractitionerDetails = "Person.generalPractitionerDetails";
 	String Person_gestationAgeAtBirth = "Person.gestationAgeAtBirth";
+	String Person_gestationalAgeCategory = "Person.gestationalAgeCategory";
 	String Person_hasCovidApp = "Person.hasCovidApp";
 	String Person_hasGuardian = "Person.hasGuardian";
 	String Person_incapacitated = "Person.incapacitated";
@@ -2326,6 +2329,7 @@ public interface Captions {
 	String Person_matchingCase = "Person.matchingCase";
 	String Person_mothersMaidenName = "Person.mothersMaidenName";
 	String Person_mothersName = "Person.mothersName";
+	String Person_multipleBirth = "Person.multipleBirth";
 	String Person_namesOfGuardians = "Person.namesOfGuardians";
 	String Person_nationalHealthId = "Person.nationalHealthId";
 	String Person_nickname = "Person.nickname";
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java
@@ -776,6 +776,7 @@ public interface Strings {
 	String headingOutbreakIn = "headingOutbreakIn";
 	String headingPaperFormDates = "headingPaperFormDates";
 	String headingPathogenTestsDeleted = "headingPathogenTestsDeleted";
+	String headingPerinatalDetails = "headingPerinatalDetails";
 	String headingPersonData = "headingPersonData";
 	String headingPersonInformation = "headingPersonInformation";
 	String headingPersonOccupation = "headingPersonOccupation";
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/BirthWeightCategory.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/BirthWeightCategory.java
@@ -0,0 +1,40 @@
+/*
+ * 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.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Birth weight categories for perinatal surveillance.
+ * Used specifically for RSV disease surveillance to categorize birth weight status.
+ */
+public enum BirthWeightCategory {
+
+    /**
+     * Normal birth weight
+     */
+    NORMAL,
+
+    /**
+     * Low birth weight (stunted growth)
+     */
+    LOW_BIRTH_WEIGHT;
+
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
+}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/GestationalAgeCategory.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/GestationalAgeCategory.java
@@ -0,0 +1,45 @@
+/*
+ * 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.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Gestational age categories for perinatal surveillance.
+ * Used specifically for RSV disease surveillance to categorize pregnancy terms.
+ */
+public enum GestationalAgeCategory {
+
+	/**
+	 * At term (between 38 and 42 weeks of pregnancy)
+	 */
+	AT_TERM,
+
+	/**
+	 * Prematurely before 32 weeks of pregnancy
+	 */
+	PREMATURE_BEFORE_32,
+
+	/**
+	 * Prematurely between 32 and 38 weeks of pregnancy
+	 */
+	PREMATURE_32_TO_38;
+
+	@Override
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/MultipleBirth.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/MultipleBirth.java
@@ -0,0 +1,45 @@
+/*
+ * 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.person;
+
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Multiple birth classification for perinatal surveillance.
+ * Used specifically for RSV disease surveillance to track multiple births.
+ */
+public enum MultipleBirth {
+
+    /**
+     * Single birth (No - 1)
+     */
+    SINGLE,
+
+    /**
+     * Twin birth (Twins - 2)
+     */
+    TWINS,
+
+    /**
+     * Multiple birth (Triplet 3+ or more)
+     */
+    MULTIPLE;
+
+    @Override
+    public String toString() {
+        return I18nProperties.getEnumCaption(this);
+    }
+}
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java
@@ -112,6 +112,10 @@ public class PersonDto extends PseudonymizableDto implements IsPerson {
 	public static final String PLACE_OF_BIRTH_FACILITY_DETAILS = "placeOfBirthFacilityDetails";
 	public static final String GESTATION_AGE_AT_BIRTH = "gestationAgeAtBirth";
 	public static final String BIRTH_WEIGHT = "birthWeight";
+	public static final String GESTATIONAL_AGE_CATEGORY = "gestationalAgeCategory";
+	public static final String BIRTH_WEIGHT_CATEGORY = "birthWeightCategory";
+	public static final String BIRTH_WEIGHT_VALUE = "birthWeightValue";
+	public static final String MULTIPLE_BIRTH = "multipleBirth";
 	public static final String PASSPORT_NUMBER = "passportNumber";
 	public static final String NATIONAL_HEALTH_ID = "nationalHealthId";
 	public static final String EMAIL_ADDRESS = "emailAddress";
@@ -247,6 +251,20 @@ public class PersonDto extends PseudonymizableDto implements IsPerson {
 	@HideForCountries
 	private Integer birthWeight;
 
+	// RSV-specific perinatal fields
+	@Diseases({
+		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
+	private GestationalAgeCategory gestationalAgeCategory;
+	@Diseases({
+		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
+	private BirthWeightCategory birthWeightCategory;
+	@Diseases({
+		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
+	private Integer birthWeightValue;
+	@Diseases({
+		Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
+	private MultipleBirth multipleBirth;
+
 	@Outbreaks
 	private PresentCondition presentCondition;
 	private Date deathDate;
@@ -388,12 +406,18 @@ public class PersonDto extends PseudonymizableDto implements IsPerson {
 	@HideForCountriesExcept(countries = {
 		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	@SensitiveData
-	@Diseases(value = {Disease.TUBERCULOSIS, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION, Disease.INVASIVE_MENINGOCOCCAL_INFECTION})
+	@Diseases(value = {
+		Disease.TUBERCULOSIS,
+		Disease.INVASIVE_PNEUMOCOCCAL_INFECTION,
+		Disease.INVASIVE_MENINGOCOCCAL_INFECTION })
 	private Date entryDate;
 	@HideForCountriesExcept(countries = {
 		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	@SensitiveData
-	@Diseases(value = {Disease.TUBERCULOSIS, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION, Disease.INVASIVE_MENINGOCOCCAL_INFECTION})
+	@Diseases(value = {
+		Disease.TUBERCULOSIS,
+		Disease.INVASIVE_PNEUMOCOCCAL_INFECTION,
+		Disease.INVASIVE_MENINGOCOCCAL_INFECTION })
 	private LivingStatus livingStatus;
 
 	@SuppressWarnings("serial")
@@ -927,6 +951,38 @@ public void setBirthWeight(Integer birthWeight) {
 		this.birthWeight = birthWeight;
 	}
 
+	public GestationalAgeCategory getGestationalAgeCategory() {
+		return gestationalAgeCategory;
+	}
+
+	public void setGestationalAgeCategory(GestationalAgeCategory gestationalAgeCategory) {
+		this.gestationalAgeCategory = gestationalAgeCategory;
+	}
+
+	public BirthWeightCategory getBirthWeightCategory() {
+		return birthWeightCategory;
+	}
+
+	public void setBirthWeightCategory(BirthWeightCategory birthWeightCategory) {
+		this.birthWeightCategory = birthWeightCategory;
+	}
+
+	public Integer getBirthWeightValue() {
+		return birthWeightValue;
+	}
+
+	public void setBirthWeightValue(Integer birthWeightValue) {
+		this.birthWeightValue = birthWeightValue;
+	}
+
+	public MultipleBirth getMultipleBirth() {
+		return multipleBirth;
+	}
+
+	public void setMultipleBirth(MultipleBirth multipleBirth) {
+		this.multipleBirth = multipleBirth;
+	}
+
 	public String getPassportNumber() {
 		return passportNumber;
 	}
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -1985,6 +1985,10 @@ Person.livingStatus=Living Status
 Person.hasGuardian=Person has a legal guardian (i.e. in case of minors or incapacitated persons)
 Person.incapacitated=Incapacitated (i.e. person will have a legal guardian after 18)
 Person.emancipated=Emancipated (i.e. person is under 18 and does not have a guardian by law)
+Person.gestationalAgeCategory=Gestational age category
+Person.birthWeightCategory=Birth weight category
+Person.birthWeightValue=Birth weight value
+Person.multipleBirth=Multiple birth
 personContactDetailOwner=Owner
 personContactDetailOwnerName=Owner name
 personContactDetailThisPerson=This person
diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties
@@ -854,6 +854,11 @@ GatheringType.FAIR=Fair
 GatheringType.SPORTING_EVENT=Sporting event
 GatheringType.OTHER=Other
 
+# GestationalAgeCategory
+GestationalAgeCategory.AT_TERM=At term (between 38 and 42 weeks of pregnancy)
+GestationalAgeCategory.PREMATURE_BEFORE_32=Prematurely before 32 weeks of pregnancy
+GestationalAgeCategory.PREMATURE_32_TO_38=Prematurely between 32 and 38 weeks of pregnancy
+
 HabitationType.MEDICAL=Stay in a Medical Institution
 HabitationType.OTHER=Other
 
@@ -2295,6 +2300,12 @@ MedicallyAssociatedTransmissionMode.ORGAN_TRANSPLANTATION=Organ transplantation
 MedicallyAssociatedTransmissionMode.DIALYSIS=Dialysis
 MedicallyAssociatedTransmissionMode.INJECTION_FOR_MEDICAL_PURPOSES=Injection for medical purposes
 
+
+# MultipleBirth
+MultipleBirth.SINGLE=Single birth (Singleton - 1)
+MultipleBirth.TWIN=Twin birth (Twins - 2)
+MultipleBirth.MULTIPLE=Multiple birth (Triplet 3+ or more)
+
 # ExternalShareDateType
 ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE = Last share with reporting tool
 
@@ -2585,6 +2596,10 @@ BirthTerm.FULL_TERM=Full-term
 BirthTerm.PRE_TERM=Pre-term
 BirthTerm.POST_TERM=Post-term
 
+# BirthWeightCategory
+BirthWeightCategory.NORMAL=Normal birth weight
+BirthWeightCategory.LOW_BIRTH_WEIGHT=Low birth weight (stunted growth)
+
 # DeliveryProcedure
 DeliveryProcedure.NORMAL=Normal
 DeliveryProcedure.CAESAREAN=Caesarean
diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties
@@ -674,6 +674,7 @@ headingPaperFormDates = Reception dates of paper form
 headingPersonData = Person data
 headingPersonInformation = Person information
 headingPersonOccupation = Occupation & education
+headingPerinatalDetails = Perinatal details
 headingPickEventGroup = Pick event group
 headingPickEventParticipants = Pick or merge event participants
 headingPickEventParticipantsIncompleteSelection = Incomplete selection
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java
@@ -46,12 +46,15 @@
 import de.symeda.sormas.api.infrastructure.facility.FacilityType;
 import de.symeda.sormas.api.person.ApproximateAgeType;
 import de.symeda.sormas.api.person.ArmedForcesRelationType;
+import de.symeda.sormas.api.person.BirthWeightCategory;
 import de.symeda.sormas.api.person.BurialConductor;
 import de.symeda.sormas.api.person.CauseOfDeath;
 import de.symeda.sormas.api.person.DeathPlaceType;
 import de.symeda.sormas.api.person.EducationType;
+import de.symeda.sormas.api.person.GestationalAgeCategory;
 import de.symeda.sormas.api.person.IsPerson;
 import de.symeda.sormas.api.person.LivingStatus;
+import de.symeda.sormas.api.person.MultipleBirth;
 import de.symeda.sormas.api.person.OccupationType;
 import de.symeda.sormas.api.person.OccupationTypeConverter;
 import de.symeda.sormas.api.person.PersonContactDetailType;
@@ -122,6 +125,10 @@ public class Person extends AbstractDomainObject implements IsPerson, HasExterna
 	public static final String PLACE_OF_BIRTH_FACILITY_DETAILS = "placeOfBirthFacilityDetails";
 	public static final String GESTATION_AGE_AT_BIRTH = "gestationAgeAtBirth";
 	public static final String BIRTH_WEIGHT = "birthWeight";
+	public static final String GESTATIONAL_AGE_CATEGORY = "gestationalAgeCategory";
+	public static final String BIRTH_WEIGHT_CATEGORY = "birthWeightCategory";
+	public static final String BIRTH_WEIGHT_VALUE = "birthWeightValue";
+	public static final String MULTIPLE_BIRTH = "multipleBirth";
 	public static final String PASSPORT_NUMBER = "passportNumber";
 	public static final String NATIONAL_HEALTH_ID = "nationalHealthId";
 	public static final String PLACE_OF_BIRTH_FACILITY_TYPE = "placeOfBirthFacilityType";
@@ -186,6 +193,10 @@ public class Person extends AbstractDomainObject implements IsPerson, HasExterna
 	private String placeOfBirthFacilityDetails;
 	private Integer gestationAgeAtBirth;
 	private Integer birthWeight;
+	private GestationalAgeCategory gestationalAgeCategory;
+	private BirthWeightCategory birthWeightCategory;
+	private Integer birthWeightValue;
+	private MultipleBirth multipleBirth;
 	private Date deathDate;
 
 	private EducationType educationType;
@@ -591,6 +602,41 @@ public void setBirthWeight(Integer birthWeight) {
 		this.birthWeight = birthWeight;
 	}
 
+	@Enumerated(EnumType.STRING)
+	public GestationalAgeCategory getGestationalAgeCategory() {
+		return gestationalAgeCategory;
+	}
+
+	public void setGestationalAgeCategory(GestationalAgeCategory gestationalAgeCategory) {
+		this.gestationalAgeCategory = gestationalAgeCategory;
+	}
+
+	@Enumerated(EnumType.STRING)
+	public BirthWeightCategory getBirthWeightCategory() {
+		return birthWeightCategory;
+	}
+
+	public void setBirthWeightCategory(BirthWeightCategory birthWeightCategory) {
+		this.birthWeightCategory = birthWeightCategory;
+	}
+
+	public Integer getBirthWeightValue() {
+		return birthWeightValue;
+	}
+
+	public void setBirthWeightValue(Integer birthWeightValue) {
+		this.birthWeightValue = birthWeightValue;
+	}
+
+	@Enumerated(EnumType.STRING)
+	public MultipleBirth getMultipleBirth() {
+		return multipleBirth;
+	}
+
+	public void setMultipleBirth(MultipleBirth multipleBirth) {
+		this.multipleBirth = multipleBirth;
+	}
+
 	@Column
 	public String getPassportNumber() {
 		return passportNumber;
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java
diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java
