Skip to content

Commit d566f1e

Browse files
raulbobraulbob
authored
Merge pull request #13566 from SORMAS-Foundation/feature-13540-rsv_update_health_conditions
#13540 - Updated RSV health conditions
2 parents e36bc4a + 2a4eeca commit d566f1e

7 files changed

Lines changed: 72 additions & 3 deletions

File tree

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public class HealthConditionsDto extends PseudonymizableDto {
5353
public static final String TUBERCULOSIS_INFECTION_YEAR = "tuberculosisInfectionYear";
5454
public static final String PREVIOUS_TUBERCULOSIS_TREATMENT = "previousTuberculosisTreatment";
5555
public static final String COMPLIANCE_WITH_TREATMENT = "complianceWithTreatment";
56+
public static final String RECURRENT_BRONCHIOLITIS = "recurrentBronchiolitis";
57+
public static final String IMMUNODEPRESSION = "immunodepression";
5658

5759
@HideForCountries(countries = {
5860
CountryHelper.COUNTRY_CODE_GERMANY,
@@ -140,6 +142,14 @@ public class HealthConditionsDto extends PseudonymizableDto {
140142
Disease.TUBERCULOSIS })
141143
private ComplianceWithTreatment complianceWithTreatment;
142144

145+
@Diseases(value = {
146+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
147+
private YesNoUnknown recurrentBronchiolitis;
148+
149+
@Diseases(value = {
150+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS })
151+
private YesNoUnknown immunodepression;
152+
143153
public static HealthConditionsDto build() {
144154
HealthConditionsDto healthConditions = new HealthConditionsDto();
145155
healthConditions.setUuid(DataHelper.createUuid());
@@ -377,4 +387,20 @@ public ComplianceWithTreatment getComplianceWithTreatment() {
377387
public void setComplianceWithTreatment(ComplianceWithTreatment complianceWithTreatment) {
378388
this.complianceWithTreatment = complianceWithTreatment;
379389
}
390+
391+
public YesNoUnknown getRecurrentBronchiolitis() {
392+
return recurrentBronchiolitis;
393+
}
394+
395+
public void setRecurrentBronchiolitis(YesNoUnknown recurrentBronchiolitis) {
396+
this.recurrentBronchiolitis = recurrentBronchiolitis;
397+
}
398+
399+
public YesNoUnknown getImmunodepression() {
400+
return immunodepression;
401+
}
402+
403+
public void setImmunodepression(YesNoUnknown immunodepression) {
404+
this.immunodepression = immunodepression;
405+
}
380406
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,10 +1972,12 @@ public interface Captions {
19721972
String HealthConditions_hivArt = "HealthConditions.hivArt";
19731973
String HealthConditions_immunodeficiencyIncludingHiv = "HealthConditions.immunodeficiencyIncludingHiv";
19741974
String HealthConditions_immunodeficiencyOtherThanHiv = "HealthConditions.immunodeficiencyOtherThanHiv";
1975+
String HealthConditions_immunodepression = "HealthConditions.immunodepression";
19751976
String HealthConditions_malignancyChemotherapy = "HealthConditions.malignancyChemotherapy";
19761977
String HealthConditions_obesity = "HealthConditions.obesity";
19771978
String HealthConditions_otherConditions = "HealthConditions.otherConditions";
19781979
String HealthConditions_previousTuberculosisTreatment = "HealthConditions.previousTuberculosisTreatment";
1980+
String HealthConditions_recurrentBronchiolitis = "HealthConditions.recurrentBronchiolitis";
19791981
String HealthConditions_sickleCellDisease = "HealthConditions.sickleCellDisease";
19801982
String HealthConditions_tuberculosis = "HealthConditions.tuberculosis";
19811983
String HealthConditions_tuberculosisInfectionYear = "HealthConditions.tuberculosisInfectionYear";

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,6 +1620,8 @@ HealthConditions.formerSmoker=Former smoker
16201620
HealthConditions.asthma=Asthma
16211621
HealthConditions.sickleCellDisease=Sickle cell disease
16221622
HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV
1623+
HealthConditions.recurrentBronchiolitis=Recurrent bronchiolitis
1624+
HealthConditions.immunodepression=Immunodepression
16231625
HealthConditions.previousTuberculosisTreatment=Previous Anti-TB Treatment(at least one month)
16241626
HealthConditions.tuberculosisInfectionYear=Year of infection
16251627
HealthConditions.complianceWithTreatment=Compliance With Treatment

‎sormas-backend/src/main/java/de/symeda/sormas/backend/clinicalcourse/HealthConditions.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ public class HealthConditions extends AbstractDomainObject {
4646
private YesNoUnknown previousTuberculosisTreatment;
4747
private ComplianceWithTreatment complianceWithTreatment;
4848

49+
private YesNoUnknown recurrentBronchiolitis;
50+
private YesNoUnknown immunodepression;
51+
4952
@Enumerated(EnumType.STRING)
5053
public YesNoUnknown getTuberculosis() {
5154
return tuberculosis;
@@ -278,4 +281,22 @@ public ComplianceWithTreatment getComplianceWithTreatment() {
278281
public void setComplianceWithTreatment(ComplianceWithTreatment complianceWithTreatment) {
279282
this.complianceWithTreatment = complianceWithTreatment;
280283
}
284+
285+
@Enumerated(EnumType.STRING)
286+
public YesNoUnknown getRecurrentBronchiolitis() {
287+
return recurrentBronchiolitis;
288+
}
289+
290+
public void setRecurrentBronchiolitis(YesNoUnknown recurrentBronchiolitis) {
291+
this.recurrentBronchiolitis = recurrentBronchiolitis;
292+
}
293+
294+
@Enumerated(EnumType.STRING)
295+
public YesNoUnknown getImmunodepression() {
296+
return immunodepression;
297+
}
298+
299+
public void setImmunodepression(YesNoUnknown immunodepression) {
300+
this.immunodepression = immunodepression;
301+
}
281302
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/clinicalcourse/HealthConditionsMapper.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public static HealthConditionsDto toDto(HealthConditions source) {
6161
target.setPreviousTuberculosisTreatment(source.getPreviousTuberculosisTreatment());
6262
target.setTuberculosisInfectionYear(source.getTuberculosisInfectionYear());
6363
target.setComplianceWithTreatment(source.getComplianceWithTreatment());
64+
target.setRecurrentBronchiolitis(source.getRecurrentBronchiolitis());
65+
target.setImmunodepression(source.getImmunodepression());
6466
return target;
6567
}
6668

@@ -97,6 +99,8 @@ public HealthConditions fillOrBuildEntity(@NotNull HealthConditionsDto source, H
9799
target.setPreviousTuberculosisTreatment(source.getPreviousTuberculosisTreatment());
98100
target.setTuberculosisInfectionYear(source.getTuberculosisInfectionYear());
99101
target.setComplianceWithTreatment(source.getComplianceWithTreatment());
102+
target.setRecurrentBronchiolitis(source.getRecurrentBronchiolitis());
103+
target.setImmunodepression(source.getImmunodepression());
100104

101105
return target;
102106
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14515,4 +14515,14 @@ ALTER TABLE exposures_history ADD COLUMN IF NOT EXISTS childcareFacilityDetails
1451514515

1451614516
INSERT INTO schema_version (version_number, comment) VALUES (584, 'RSV EpiData updates #13538');
1451714517

14518+
-- 2025-08-05 RSV - Update Health Conditions section #13540
14519+
14520+
ALTER TABLE healthconditions ADD COLUMN IF NOT EXISTS recurrentBronchiolitis varchar(255);
14521+
ALTER TABLE healthconditions ADD COLUMN IF NOT EXISTS immunodepression varchar(255);
14522+
14523+
ALTER TABLE healthconditions_history ADD COLUMN IF NOT EXISTS recurrentBronchiolitis varchar(255);
14524+
ALTER TABLE healthconditions_history ADD COLUMN IF NOT EXISTS immunodepression varchar(255);
14525+
14526+
INSERT INTO schema_version (version_number, comment) VALUES (585, 'RSV - Update Health Conditions section #13540');
14527+
1451814528
-- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***

‎sormas-ui/src/main/java/de/symeda/sormas/ui/clinicalcourse/HealthConditionsForm.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.I18N_PREFIX;
2121
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.IMMUNODEFICIENCY_INCLUDING_HIV;
2222
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.IMMUNODEFICIENCY_OTHER_THAN_HIV;
23+
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.IMMUNODEPRESSION;
2324
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.MALIGNANCY_CHEMOTHERAPY;
2425
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.OBESITY;
2526
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.OTHER_CONDITIONS;
2627
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.PREVIOUS_TUBERCULOSIS_TREATMENT;
28+
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.RECURRENT_BRONCHIOLITIS;
2729
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.SICKLE_CELL_DISEASE;
2830
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.TUBERCULOSIS;
2931
import static de.symeda.sormas.api.clinicalcourse.HealthConditionsDto.TUBERCULOSIS_INFECTION_YEAR;
@@ -84,11 +86,11 @@ public class HealthConditionsForm extends AbstractEditForm<HealthConditionsDto>
8486
fluidColumn(6, 0, locs(
8587
TUBERCULOSIS, PREVIOUS_TUBERCULOSIS_TREATMENT, ASPLENIA, HEPATITIS, DIABETES, IMMUNODEFICIENCY_OTHER_THAN_HIV,
8688
IMMUNODEFICIENCY_INCLUDING_HIV, HIV, HIV_ART, CONGENITAL_SYPHILIS, DOWN_SYNDROME,
87-
CHRONIC_LIVER_DISEASE, MALIGNANCY_CHEMOTHERAPY)),
89+
CHRONIC_LIVER_DISEASE, MALIGNANCY_CHEMOTHERAPY, RECURRENT_BRONCHIOLITIS)),
8890
fluidColumn(6, 0, locs(
8991
"TUBERCULOSIS_INFECTION_YEAR_LAYOUT","COMPLIANCE_WITH_TREATMENT_LAYOUT",CHRONIC_HEART_FAILURE, CHRONIC_PULMONARY_DISEASE, CHRONIC_KIDNEY_DISEASE,
9092
CHRONIC_NEUROLOGIC_CONDITION, CARDIOVASCULAR_DISEASE_INCLUDING_HYPERTENSION,
91-
OBESITY, CURRENT_SMOKER, FORMER_SMOKER, ASTHMA, SICKLE_CELL_DISEASE))
93+
OBESITY, CURRENT_SMOKER, FORMER_SMOKER, ASTHMA, SICKLE_CELL_DISEASE, IMMUNODEPRESSION))
9294
) + loc(OTHER_CONDITIONS) + loc(CONFIDENTIAL_LABEL_LOC)+loc(DIAGNOSIS_LABEL_LOC);
9395
//@formatter:on
9496

@@ -115,7 +117,9 @@ public class HealthConditionsForm extends AbstractEditForm<HealthConditionsDto>
115117
FORMER_SMOKER,
116118
ASTHMA,
117119
SICKLE_CELL_DISEASE,
118-
IMMUNODEFICIENCY_INCLUDING_HIV);
120+
IMMUNODEFICIENCY_INCLUDING_HIV,
121+
RECURRENT_BRONCHIOLITIS,
122+
IMMUNODEPRESSION);
119123

120124
public HealthConditionsForm(FieldVisibilityCheckers fieldVisibilityCheckers, UiFieldAccessCheckers fieldAccessCheckers) {
121125
super(HealthConditionsDto.class, I18N_PREFIX, true, fieldVisibilityCheckers, fieldAccessCheckers);

0 commit comments

Comments
 (0)