Skip to content

Feature 13797 & 13810 Malaria and Dengue diseases #13877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KarnaiahPesula merged 11 commits into from
Mar 13, 2026
Merged

Feature 13797 & 13810 Malaria and Dengue diseases #13877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ddc2c8d
Malaria and Dengue disease
KarnaiahPesula Mar 10, 2026
6a6486c
Merge branch 'refs/heads/development' into feature-13797-malaria-disease
KarnaiahPesula Mar 10, 2026
d3a687b
Features: #13810 & #13796
KarnaiahPesula Mar 10, 2026
ca6f9df
Merge branch 'refs/heads/development' into feature-13797-malaria-disease
KarnaiahPesula Mar 11, 2026
39257c5
Fixes: Feature# 13874
KarnaiahPesula Mar 11, 2026
4271928
Used the constructor instead of builder pattern
KarnaiahPesula Mar 11, 2026
173e01d
Fixed the possible issues with symptoms and vaccine form.
KarnaiahPesula Mar 11, 2026
263a273
Refactored Vaccine enum with optionals
raulbob Mar 12, 2026
8e9722e
Vaccine changes: Added possible translated keys.
KarnaiahPesula Mar 12, 2026
c67461c
Vaccine changes: Fetching the manufacturer name, instead of optional
KarnaiahPesula Mar 12, 2026
90c15f7
Vaccine changes: possible NPE fix
KarnaiahPesula Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 90 additions & 69 deletions sormas-api/src/main/java/de/symeda/sormas/api/Disease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,73 +25,73 @@ public enum Disease
implements
StatisticsGroupingKey {

AFP(true, true, true, false, true, 60, true, false, false),
CHOLERA(true, true, true, false, true, 5, true, false, false),
CONGENITAL_RUBELLA(true, true, true, false, true, 21, true, false, false),
CSM(true, true, true, false, true, 10, true, false, false),
DENGUE(true, true, true, false, false, 14, true, false, false),
EVD(true, true, true, false, true, 21, true, false, false),
GUINEA_WORM(true, true, true, false, false, 0, true, false, false),
LASSA(true, true, true, false, true, 21, true, false, false),
MEASLES(true, true, true, false, true, 21, true, true, false),
MONKEYPOX(true, true, true, false, true, 21, true, false, false),
NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false),
PLAGUE(true, true, true, false, true, 7, true, false, false),
POLIO(true, true, true, false, true, 60, true, false, false),
UNSPECIFIED_VHF(true, true, true, false, true, 21, true, false, false),
WEST_NILE_FEVER(true, false, true, false, false, 0, true, false, false),
YELLOW_FEVER(true, true, true, false, false, 6, true, false, false),
RABIES(true, true, true, false, true, 6, true, false, false),
ANTHRAX(true, true, true, false, false, 0, true, false, false),
CORONAVIRUS(true, true, true, false, true, 14, true, true, true),
PNEUMONIA(true, false, true, false, false, 0, true, false, false),
MALARIA(true, false, false, true, false, 0, true, false, false),
TYPHOID_FEVER(true, false, false, true, false, 0, true, false, false),
ACUTE_VIRAL_HEPATITIS(true, false, false, true, false, 0, true, false, false),
NON_NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false),
HIV(true, false, false, true, false, 0, true, false, false),
SCHISTOSOMIASIS(true, false, false, true, false, 0, true, false, false),
SOIL_TRANSMITTED_HELMINTHS(true, false, false, true, false, 0, true, false, false),
TRYPANOSOMIASIS(true, false, false, true, false, 0, true, false, false),
DIARRHEA_DEHYDRATION(true, false, false, true, false, 0, true, false, false),
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(false, true, true, true, true, 365, true, false, false),
LATENT_TUBERCULOSIS(false, true, true, true, true, 30, 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),
PERTUSSIS(true, false, false, true, true, 0, true, false, false),
NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false),
ONCHOCERCIASIS(true, false, false, true, false, 0, true, false, false),
DIPHTERIA(true, false, false, true, false, 0, true, false, false),
TRACHOMA(true, false, false, true, false, 0, true, false, false),
YAWS_ENDEMIC_SYPHILIS(true, false, false, true, false, 0, true, false, false),
MATERNAL_DEATHS(true, false, false, true, false, 0, true, false, false),
PERINATAL_DEATHS(true, false, false, true, false, 0, true, false, false),
INFLUENZA(true, false, false, false, false, 0, true, false, false),
INFLUENZA_A(false, true, true, false, false, 0, true, false, false),
INFLUENZA_B(false, true, true, false, false, 0, true, false, false),
H_METAPNEUMOVIRUS(true, false, true, false, false, 0, true, false, false),
RESPIRATORY_SYNCYTIAL_VIRUS(true, false, true, false, false, 0, true, false, false),
PARAINFLUENZA_1_4(false, false, true, false, false, 0, true, false, false),
ADENOVIRUS(true, false, true, false, false, 0, true, false, false),
RHINOVIRUS(true, false, true, false, false, 0, true, false, false),
ENTEROVIRUS(true, false, true, false, false, 0, true, false, false),
M_PNEUMONIAE(true, false, true, false, false, 0, true, false, false),
C_PNEUMONIAE(true, false, true, false, false, 0, true, false, false),
ARI(true, false, false, true, false, 0, true, false, false),
CHIKUNGUNYA(true, false, false, true, false, 0, true, false, false),
POST_IMMUNIZATION_ADVERSE_EVENTS_MILD(true, false, false, true, false, 0, true, false, false),
POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE(true, false, false, true, false, 0, true, false, false),
FHA(true, false, false, true, false, 0, true, false, false),
INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, false, 0, false, false, false),
INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false),
GIARDIASIS(true, true, true, false, true, 14, false, false, false),
CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false),
OTHER(true, true, true, false, true, 21, false, false, false),
UNDEFINED(true, true, true, false, true, 0, false, false, false);
AFP(true, true, true, false, true, 60, true, false, false, true, 7, 30),
CHOLERA(true, true, true, false, true, 5, true, false, false, true, 0, 5),
CONGENITAL_RUBELLA(true, true, true, false, true, 21, true, false, false, false, 0, 0),
CSM(true, true, true, false, true, 10, true, false, false, false, 0, 0),
DENGUE(true, true, true, false, false, 14, true, false, false, true, 2, 14),
EVD(true, true, true, false, true, 21, true, false, false, true, 2, 21),
GUINEA_WORM(true, true, true, false, false, 0, true, false, false, false, 0, 0),
LASSA(true, true, true, false, true, 21, true, false, false, true, 3, 21),
MEASLES(true, true, true, false, true, 21, true, true, false, true, 7, 21),
MONKEYPOX(true, true, true, false, true, 21, true, false, false, true, 5, 21),
NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false, false, 0, 0),
PLAGUE(true, true, true, false, true, 7, true, false, false, true, 1, 7),
POLIO(true, true, true, false, true, 60, true, false, false, true, 7, 30),
UNSPECIFIED_VHF(true, true, true, false, true, 21, true, false, false, true, 2, 21),
WEST_NILE_FEVER(true, false, true, false, false, 0, true, false, false, true, 2, 14),
YELLOW_FEVER(true, true, true, false, false, 6, true, false, false, true, 3, 6),
RABIES(true, true, true, false, true, 6, true, false, false, true, 5, 730),
ANTHRAX(true, true, true, false, false, 0, true, false, false, true, 1, 60),
CORONAVIRUS(true, true, true, false, true, 14, true, true, true, true, 1, 14),
PNEUMONIA(true, false, true, true, false, 0, true, false, false, false, 0, 0),
MALARIA(true, true, false, true, false, 0, true, false, false, true, 7, 60),
TYPHOID_FEVER(true, false, false, true, false, 0, true, false, false, false, 0, 0),
ACUTE_VIRAL_HEPATITIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
NON_NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
HIV(true, false, false, true, false, 0, true, false, false, true, 10, 180),
SCHISTOSOMIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
SOIL_TRANSMITTED_HELMINTHS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
TRYPANOSOMIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
DIARRHEA_DEHYDRATION(true, false, false, true, false, 0, true, false, false, false, 0, 0),
DIARRHEA_BLOOD(true, false, false, true, false, 0, true, false, false, false, 0, 0),
SNAKE_BITE(true, false, false, true, false, 0, true, false, false, false, 0, 0),
RUBELLA(true, false, false, true, false, 0, true, false, false, true, 14, 23),
TUBERCULOSIS(false, true, true, true, true, 365, true, false, false, true, 30, 730),
LATENT_TUBERCULOSIS(false, true, true, true, true, 30, true, false, false, false, 0, 0),
LEPROSY(true, false, false, true, false, 0, true, false, false, true, 18, 730),
LYMPHATIC_FILARIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
BURULI_ULCER(true, false, false, true, false, 0, true, false, false, false, 0, 0),
PERTUSSIS(true, false, false, true, true, 0, true, false, false, true, 4, 21),
NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false, true, 3, 21),
ONCHOCERCIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
DIPHTERIA(true, false, false, true, false, 0, true, false, false, true, 1, 10),
TRACHOMA(true, false, false, true, false, 0, true, false, false, false, 0, 0),
YAWS_ENDEMIC_SYPHILIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
MATERNAL_DEATHS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
PERINATAL_DEATHS(true, false, false, true, false, 0, true, false, false, true, 1, 4),
INFLUENZA(true, false, false, false, false, 0, true, false, false, true, 1, 4),
INFLUENZA_A(false, true, true, false, false, 0, true, false, false, true, 1, 4),
INFLUENZA_B(false, true, true, false, false, 0, true, false, false, true, 1, 4),
H_METAPNEUMOVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
RESPIRATORY_SYNCYTIAL_VIRUS(true, false, true, false, false, 0, true, false, false, true, 2, 8),
PARAINFLUENZA_1_4(false, false, true, true, false, 0, true, false, false, false, 0, 0),
ADENOVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
RHINOVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
ENTEROVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
M_PNEUMONIAE(true, false, true, true, false, 0, true, false, false, false, 0, 0),
C_PNEUMONIAE(true, false, true, true, false, 0, true, false, false, false, 0, 0),
ARI(true, false, false, true, false, 0, true, false, false, false, 0, 0),
CHIKUNGUNYA(true, false, false, true, false, 0, true, false, false, true, 2, 14),
POST_IMMUNIZATION_ADVERSE_EVENTS_MILD(true, false, false, true, false, 0, true, false, false, false, 0, 0),
POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE(true, false, false, true, false, 0, true, false, false, false, 0, 0),
FHA(true, false, false, true, false, 0, true, false, false, false, 0, 0),
INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, false, 0, false, false, false, true, 1, 3),
INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false, true, 1, 10),
GIARDIASIS(true, true, true, false, true, 14, false, false, false, true, 7, 21),
CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false, true, 2, 12),
OTHER(true, true, true, false, true, 21, false, false, false, false, 0, 0),
UNDEFINED(true, true, true, false, true, 0, false, false, false, false, 0, 0);

private final boolean defaultActive;
private final boolean defaultPrimary;
Expand All @@ -102,6 +102,9 @@ public enum Disease
private final boolean variantAllowed;
private final boolean defaultExtendedClassification;
private final boolean defaultExtendedClassificationMulti;
private final boolean defaultIncubationPeriodEnabled;
private final int defaultMinIncubationPeriod;
private final int defaultMaxIncubationPeriod;

Disease(
boolean defaultActive,
Expand All @@ -112,7 +115,10 @@ public enum Disease
int defaultFollowUpDuration,
boolean variantAllowed,
boolean defaultExtendedClassification,
boolean defaultExtendedClassificationMulti) {
boolean defaultExtendedClassificationMulti,
boolean defaultIncubationPeriodEnabled,
int defaultMinIncubationPeriod,
int defaultMaxIncubationPeriod) {

this.defaultActive = defaultActive;
this.defaultPrimary = defaultPrimary;
Expand All @@ -123,6 +129,9 @@ public enum Disease
this.variantAllowed = variantAllowed;
this.defaultExtendedClassification = defaultExtendedClassification;
this.defaultExtendedClassificationMulti = defaultExtendedClassificationMulti;
this.defaultIncubationPeriodEnabled = defaultIncubationPeriodEnabled;
this.defaultMinIncubationPeriod = defaultMinIncubationPeriod;
this.defaultMaxIncubationPeriod = defaultMaxIncubationPeriod;
}

@Override
Expand Down Expand Up @@ -189,6 +198,18 @@ public boolean isDefaultExtendedClassificationMulti() {
return defaultExtendedClassificationMulti;
}

public boolean isDefaultIncubationPeriodEnabled() {
return defaultIncubationPeriodEnabled;
}

public int getDefaultMinIncubationPeriod() {
return defaultMinIncubationPeriod;
}

public int getDefaultMaxIncubationPeriod() {
return defaultMaxIncubationPeriod;
}

@Override
public int keyCompareTo(StatisticsGroupingKey o) {

Expand All @@ -203,5 +224,5 @@ public int keyCompareTo(StatisticsGroupingKey o) {
return this.toString().compareTo(o.toString());
}

public static List<Disease> DISEASE_LIST = Arrays.asList(Disease.values());
public static final List<Disease> DISEASE_LIST = Arrays.asList(Disease.values());
}
36 changes: 36 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,52 +494,86 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
private boolean nosocomialOutbreak;
@HideForCountriesExcept
private InfectionSetting infectionSetting;
@Diseases(value = {
Disease.MALARIA }, hide = true)
private QuarantineType quarantine;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
@SensitiveData
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
@Diseases(value = {
Disease.MALARIA }, hide = true)
private String quarantineTypeDetails;
@Diseases(value = {
Disease.MALARIA }, hide = true)
private Date quarantineFrom;
@Diseases(value = {
Disease.MALARIA }, hide = true)
private Date quarantineTo;
@SensitiveData
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
@Diseases(value = {
Disease.MALARIA }, hide = true)
private String quarantineHelpNeeded;
@HideForCountriesExcept(countries = {
COUNTRY_CODE_GERMANY,
COUNTRY_CODE_SWITZERLAND })
@Diseases(value = {
Disease.MALARIA }, hide = true)
private boolean quarantineOrderedVerbally;
@HideForCountriesExcept(countries = {
COUNTRY_CODE_GERMANY,
COUNTRY_CODE_SWITZERLAND })
@Diseases(value = {
Disease.MALARIA }, hide = true)
private boolean quarantineOrderedOfficialDocument;
@HideForCountriesExcept(countries = {
COUNTRY_CODE_GERMANY,
COUNTRY_CODE_SWITZERLAND })
@Diseases(value = {
Disease.MALARIA }, hide = true)
private Date quarantineOrderedVerballyDate;
@HideForCountriesExcept(countries = {
COUNTRY_CODE_GERMANY,
COUNTRY_CODE_SWITZERLAND })
@Diseases(value = {
Disease.MALARIA }, hide = true)
private Date quarantineOrderedOfficialDocumentDate;
@HideForCountriesExcept
@Diseases(value = {
Disease.MALARIA }, hide = true)
private YesNoUnknown quarantineHomePossible;
@HideForCountriesExcept
@SensitiveData
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
@Diseases(value = {
Disease.MALARIA }, hide = true)
private String quarantineHomePossibleComment;
@HideForCountriesExcept
@Diseases(value = {
Disease.MALARIA }, hide = true)
private YesNoUnknown quarantineHomeSupplyEnsured;
@HideForCountriesExcept
@SensitiveData
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
@Diseases(value = {
Disease.MALARIA }, hide = true)
private String quarantineHomeSupplyEnsuredComment;
@Diseases(value = {
Disease.MALARIA }, hide = true)
private boolean quarantineExtended;
@Diseases(value = {
Disease.MALARIA }, hide = true)
private boolean quarantineReduced;
@HideForCountriesExcept(countries = {
COUNTRY_CODE_GERMANY,
COUNTRY_CODE_SWITZERLAND })
@Diseases(value = {
Disease.MALARIA }, hide = true)
private boolean quarantineOfficialOrderSent;
@HideForCountriesExcept(countries = {
COUNTRY_CODE_GERMANY,
COUNTRY_CODE_SWITZERLAND })
@Diseases(value = {
Disease.MALARIA }, hide = true)
private Date quarantineOfficialOrderSentDate;
@SensitiveData
private YesNoUnknown postpartum;
Expand Down Expand Up @@ -638,6 +672,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
private Date previousQuarantineTo;
@SensitiveData
@Size(max = CHARACTER_LIMIT_BIG, message = Validations.textTooLong)
@Diseases(value = {
Disease.MALARIA }, hide = true)
private String quarantineChangeComment;

private Map<String, String> externalData;
Expand Down
Loading
Loading