Skip to content

Commit d7e3edb

Browse files
Pa-TouchePa-Touche
committed
merge development
2 parents 81a6f51 + a3b69fb commit d7e3edb

115 files changed

Lines changed: 5241 additions & 1108 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 90 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -29,73 +29,73 @@ public enum Disease
2929
implements
3030
StatisticsGroupingKey {
3131

32-
AFP(true, true, true, false, true, 60, true, false, false),
33-
CHOLERA(true, true, true, false, true, 5, true, false, false),
34-
CONGENITAL_RUBELLA(true, true, true, false, true, 21, true, false, false),
35-
CSM(true, true, true, false, true, 10, true, false, false),
36-
DENGUE(true, true, true, false, false, 14, true, false, false),
37-
EVD(true, true, true, false, true, 21, true, false, false),
38-
GUINEA_WORM(true, true, true, false, false, 0, true, false, false),
39-
LASSA(true, true, true, false, true, 21, true, false, false),
40-
MEASLES(true, true, true, false, true, 21, true, true, false),
41-
MONKEYPOX(true, true, true, false, true, 21, true, false, false),
42-
NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false),
43-
PLAGUE(true, true, true, false, true, 7, true, false, false),
44-
POLIO(true, true, true, false, true, 60, true, false, false),
45-
UNSPECIFIED_VHF(true, true, true, false, true, 21, true, false, false),
46-
WEST_NILE_FEVER(true, false, true, false, false, 0, true, false, false),
47-
YELLOW_FEVER(true, true, true, false, false, 6, true, false, false),
48-
RABIES(true, true, true, false, true, 6, true, false, false),
49-
ANTHRAX(true, true, true, false, false, 0, true, false, false),
50-
CORONAVIRUS(true, true, true, false, true, 14, true, true, true),
51-
PNEUMONIA(true, false, true, false, false, 0, true, false, false),
52-
MALARIA(true, false, false, true, false, 0, true, false, false),
53-
TYPHOID_FEVER(true, false, false, true, false, 0, true, false, false),
54-
ACUTE_VIRAL_HEPATITIS(true, false, false, true, false, 0, true, false, false),
55-
NON_NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false),
56-
HIV(true, false, false, true, false, 0, true, false, false),
57-
SCHISTOSOMIASIS(true, false, false, true, false, 0, true, false, false),
58-
SOIL_TRANSMITTED_HELMINTHS(true, false, false, true, false, 0, true, false, false),
59-
TRYPANOSOMIASIS(true, false, false, true, false, 0, true, false, false),
60-
DIARRHEA_DEHYDRATION(true, false, false, true, false, 0, true, false, false),
61-
DIARRHEA_BLOOD(true, false, false, true, false, 0, true, false, false),
62-
SNAKE_BITE(true, false, false, true, false, 0, true, false, false),
63-
RUBELLA(true, false, false, true, false, 0, true, false, false),
64-
TUBERCULOSIS(false, true, true, true, true, 365, true, false, false),
65-
LATENT_TUBERCULOSIS(false, true, true, true, true, 30, true, false, false),
66-
LEPROSY(true, false, false, true, false, 0, true, false, false),
67-
LYMPHATIC_FILARIASIS(true, false, false, true, false, 0, true, false, false),
68-
BURULI_ULCER(true, false, false, true, false, 0, true, false, false),
69-
PERTUSSIS(true, false, false, true, true, 0, true, false, false),
70-
NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false),
71-
ONCHOCERCIASIS(true, false, false, true, false, 0, true, false, false),
72-
DIPHTERIA(true, false, false, true, false, 0, true, false, false),
73-
TRACHOMA(true, false, false, true, false, 0, true, false, false),
74-
YAWS_ENDEMIC_SYPHILIS(true, false, false, true, false, 0, true, false, false),
75-
MATERNAL_DEATHS(true, false, false, true, false, 0, true, false, false),
76-
PERINATAL_DEATHS(true, false, false, true, false, 0, true, false, false),
77-
INFLUENZA(true, false, false, false, false, 0, true, false, false),
78-
INFLUENZA_A(false, true, true, false, false, 0, true, false, false),
79-
INFLUENZA_B(false, true, true, false, false, 0, true, false, false),
80-
H_METAPNEUMOVIRUS(true, false, true, false, false, 0, true, false, false),
81-
RESPIRATORY_SYNCYTIAL_VIRUS(true, false, true, false, false, 0, true, false, false),
82-
PARAINFLUENZA_1_4(false, false, true, false, false, 0, true, false, false),
83-
ADENOVIRUS(true, false, true, false, false, 0, true, false, false),
84-
RHINOVIRUS(true, false, true, false, false, 0, true, false, false),
85-
ENTEROVIRUS(true, false, true, false, false, 0, true, false, false),
86-
M_PNEUMONIAE(true, false, true, false, false, 0, true, false, false),
87-
C_PNEUMONIAE(true, false, true, false, false, 0, true, false, false),
88-
ARI(true, false, false, true, false, 0, true, false, false),
89-
CHIKUNGUNYA(true, false, false, true, false, 0, true, false, false),
90-
POST_IMMUNIZATION_ADVERSE_EVENTS_MILD(true, false, false, true, false, 0, true, false, false),
91-
POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE(true, false, false, true, false, 0, true, false, false),
92-
FHA(true, false, false, true, false, 0, true, false, false),
93-
INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, false, 0, false, false, false),
94-
INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false),
95-
GIARDIASIS(true, true, true, false, true, 14, false, false, false),
96-
CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false),
97-
OTHER(true, true, true, false, true, 21, false, false, false),
98-
UNDEFINED(true, true, true, false, true, 0, false, false, false);
32+
AFP(true, true, true, false, true, 60, true, false, false, true, 7, 30),
33+
CHOLERA(true, true, true, false, true, 5, true, false, false, true, 0, 5),
34+
CONGENITAL_RUBELLA(true, true, true, false, true, 21, true, false, false, false, 0, 0),
35+
CSM(true, true, true, false, true, 10, true, false, false, false, 0, 0),
36+
DENGUE(true, true, true, false, false, 14, true, false, false, true, 2, 14),
37+
EVD(true, true, true, false, true, 21, true, false, false, true, 2, 21),
38+
GUINEA_WORM(true, true, true, false, false, 0, true, false, false, false, 0, 0),
39+
LASSA(true, true, true, false, true, 21, true, false, false, true, 3, 21),
40+
MEASLES(true, true, true, false, true, 21, true, true, false, true, 7, 21),
41+
MONKEYPOX(true, true, true, false, true, 21, true, false, false, true, 5, 21),
42+
NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false, false, 0, 0),
43+
PLAGUE(true, true, true, false, true, 7, true, false, false, true, 1, 7),
44+
POLIO(true, true, true, false, true, 60, true, false, false, true, 7, 30),
45+
UNSPECIFIED_VHF(true, true, true, false, true, 21, true, false, false, true, 2, 21),
46+
WEST_NILE_FEVER(true, false, true, false, false, 0, true, false, false, true, 2, 14),
47+
YELLOW_FEVER(true, true, true, false, false, 6, true, false, false, true, 3, 6),
48+
RABIES(true, true, true, false, true, 6, true, false, false, true, 5, 730),
49+
ANTHRAX(true, true, true, false, false, 0, true, false, false, true, 1, 60),
50+
CORONAVIRUS(true, true, true, false, true, 14, true, true, true, true, 1, 14),
51+
PNEUMONIA(true, false, true, true, false, 0, true, false, false, false, 0, 0),
52+
MALARIA(true, true, false, true, false, 0, true, false, false, true, 7, 60),
53+
TYPHOID_FEVER(true, false, false, true, false, 0, true, false, false, false, 0, 0),
54+
ACUTE_VIRAL_HEPATITIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
55+
NON_NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
56+
HIV(true, false, false, true, false, 0, true, false, false, true, 10, 180),
57+
SCHISTOSOMIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
58+
SOIL_TRANSMITTED_HELMINTHS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
59+
TRYPANOSOMIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
60+
DIARRHEA_DEHYDRATION(true, false, false, true, false, 0, true, false, false, false, 0, 0),
61+
DIARRHEA_BLOOD(true, false, false, true, false, 0, true, false, false, false, 0, 0),
62+
SNAKE_BITE(true, false, false, true, false, 0, true, false, false, false, 0, 0),
63+
RUBELLA(true, false, false, true, false, 0, true, false, false, true, 14, 23),
64+
TUBERCULOSIS(false, true, true, true, true, 365, true, false, false, true, 30, 730),
65+
LATENT_TUBERCULOSIS(false, true, true, true, true, 30, true, false, false, false, 0, 0),
66+
LEPROSY(true, false, false, true, false, 0, true, false, false, true, 18, 730),
67+
LYMPHATIC_FILARIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
68+
BURULI_ULCER(true, false, false, true, false, 0, true, false, false, false, 0, 0),
69+
PERTUSSIS(true, false, false, true, true, 0, true, false, false, true, 4, 21),
70+
NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false, true, 3, 21),
71+
ONCHOCERCIASIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
72+
DIPHTERIA(true, false, false, true, false, 0, true, false, false, true, 1, 10),
73+
TRACHOMA(true, false, false, true, false, 0, true, false, false, false, 0, 0),
74+
YAWS_ENDEMIC_SYPHILIS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
75+
MATERNAL_DEATHS(true, false, false, true, false, 0, true, false, false, false, 0, 0),
76+
PERINATAL_DEATHS(true, false, false, true, false, 0, true, false, false, true, 1, 4),
77+
INFLUENZA(true, false, false, false, false, 0, true, false, false, true, 1, 4),
78+
INFLUENZA_A(false, true, true, false, false, 0, true, false, false, true, 1, 4),
79+
INFLUENZA_B(false, true, true, false, false, 0, true, false, false, true, 1, 4),
80+
H_METAPNEUMOVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
81+
RESPIRATORY_SYNCYTIAL_VIRUS(true, false, true, false, false, 0, true, false, false, true, 2, 8),
82+
PARAINFLUENZA_1_4(false, false, true, true, false, 0, true, false, false, false, 0, 0),
83+
ADENOVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
84+
RHINOVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
85+
ENTEROVIRUS(true, false, true, true, false, 0, true, false, false, false, 0, 0),
86+
M_PNEUMONIAE(true, false, true, true, false, 0, true, false, false, false, 0, 0),
87+
C_PNEUMONIAE(true, false, true, true, false, 0, true, false, false, false, 0, 0),
88+
ARI(true, false, false, true, false, 0, true, false, false, false, 0, 0),
89+
CHIKUNGUNYA(true, false, false, true, false, 0, true, false, false, true, 2, 14),
90+
POST_IMMUNIZATION_ADVERSE_EVENTS_MILD(true, false, false, true, false, 0, true, false, false, false, 0, 0),
91+
POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE(true, false, false, true, false, 0, true, false, false, false, 0, 0),
92+
FHA(true, false, false, true, false, 0, true, false, false, false, 0, 0),
93+
INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, false, 0, false, false, false, true, 1, 3),
94+
INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false, true, 1, 10),
95+
GIARDIASIS(true, true, true, false, true, 14, false, false, false, true, 7, 21),
96+
CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false, true, 2, 12),
97+
OTHER(true, true, true, false, true, 21, false, false, false, false, 0, 0),
98+
UNDEFINED(true, true, true, false, true, 0, false, false, false, false, 0, 0);
9999

100100
/**
101101
* Immutable that eager loads all available diseases.
@@ -112,6 +112,9 @@ public enum Disease
112112
private final boolean variantAllowed;
113113
private final boolean defaultExtendedClassification;
114114
private final boolean defaultExtendedClassificationMulti;
115+
private final boolean defaultIncubationPeriodEnabled;
116+
private final int defaultMinIncubationPeriod;
117+
private final int defaultMaxIncubationPeriod;
115118

116119
Disease(
117120
boolean defaultActive,
@@ -122,7 +125,10 @@ public enum Disease
122125
int defaultFollowUpDuration,
123126
boolean variantAllowed,
124127
boolean defaultExtendedClassification,
125-
boolean defaultExtendedClassificationMulti) {
128+
boolean defaultExtendedClassificationMulti,
129+
boolean defaultIncubationPeriodEnabled,
130+
int defaultMinIncubationPeriod,
131+
int defaultMaxIncubationPeriod) {
126132

127133
this.defaultActive = defaultActive;
128134
this.defaultPrimary = defaultPrimary;
@@ -133,6 +139,9 @@ public enum Disease
133139
this.variantAllowed = variantAllowed;
134140
this.defaultExtendedClassification = defaultExtendedClassification;
135141
this.defaultExtendedClassificationMulti = defaultExtendedClassificationMulti;
142+
this.defaultIncubationPeriodEnabled = defaultIncubationPeriodEnabled;
143+
this.defaultMinIncubationPeriod = defaultMinIncubationPeriod;
144+
this.defaultMaxIncubationPeriod = defaultMaxIncubationPeriod;
136145
}
137146

138147
@Override
@@ -199,6 +208,18 @@ public boolean isDefaultExtendedClassificationMulti() {
199208
return defaultExtendedClassificationMulti;
200209
}
201210

211+
public boolean isDefaultIncubationPeriodEnabled() {
212+
return defaultIncubationPeriodEnabled;
213+
}
214+
215+
public int getDefaultMinIncubationPeriod() {
216+
return defaultMinIncubationPeriod;
217+
}
218+
219+
public int getDefaultMaxIncubationPeriod() {
220+
return defaultMaxIncubationPeriod;
221+
}
222+
202223
@Override
203224
public int keyCompareTo(StatisticsGroupingKey o) {
204225

@@ -213,5 +234,5 @@ public int keyCompareTo(StatisticsGroupingKey o) {
213234
return this.toString().compareTo(o.toString());
214235
}
215236

216-
public static List<Disease> DISEASE_LIST = Arrays.asList(Disease.values());
237+
public static final List<Disease> DISEASE_LIST = Arrays.asList(Disease.values());
217238
}

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,52 +494,86 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
494494
private boolean nosocomialOutbreak;
495495
@HideForCountriesExcept
496496
private InfectionSetting infectionSetting;
497+
@Diseases(value = {
498+
Disease.MALARIA }, hide = true)
497499
private QuarantineType quarantine;
498500
@SensitiveData
499501
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
502+
@Diseases(value = {
503+
Disease.MALARIA }, hide = true)
500504
private String quarantineTypeDetails;
505+
@Diseases(value = {
506+
Disease.MALARIA }, hide = true)
501507
private Date quarantineFrom;
508+
@Diseases(value = {
509+
Disease.MALARIA }, hide = true)
502510
private Date quarantineTo;
503511
@SensitiveData
504512
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
513+
@Diseases(value = {
514+
Disease.MALARIA }, hide = true)
505515
private String quarantineHelpNeeded;
506516
@HideForCountriesExcept(countries = {
507517
COUNTRY_CODE_GERMANY,
508518
COUNTRY_CODE_SWITZERLAND })
519+
@Diseases(value = {
520+
Disease.MALARIA }, hide = true)
509521
private boolean quarantineOrderedVerbally;
510522
@HideForCountriesExcept(countries = {
511523
COUNTRY_CODE_GERMANY,
512524
COUNTRY_CODE_SWITZERLAND })
525+
@Diseases(value = {
526+
Disease.MALARIA }, hide = true)
513527
private boolean quarantineOrderedOfficialDocument;
514528
@HideForCountriesExcept(countries = {
515529
COUNTRY_CODE_GERMANY,
516530
COUNTRY_CODE_SWITZERLAND })
531+
@Diseases(value = {
532+
Disease.MALARIA }, hide = true)
517533
private Date quarantineOrderedVerballyDate;
518534
@HideForCountriesExcept(countries = {
519535
COUNTRY_CODE_GERMANY,
520536
COUNTRY_CODE_SWITZERLAND })
537+
@Diseases(value = {
538+
Disease.MALARIA }, hide = true)
521539
private Date quarantineOrderedOfficialDocumentDate;
522540
@HideForCountriesExcept
541+
@Diseases(value = {
542+
Disease.MALARIA }, hide = true)
523543
private YesNoUnknown quarantineHomePossible;
524544
@HideForCountriesExcept
525545
@SensitiveData
526546
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
547+
@Diseases(value = {
548+
Disease.MALARIA }, hide = true)
527549
private String quarantineHomePossibleComment;
528550
@HideForCountriesExcept
551+
@Diseases(value = {
552+
Disease.MALARIA }, hide = true)
529553
private YesNoUnknown quarantineHomeSupplyEnsured;
530554
@HideForCountriesExcept
531555
@SensitiveData
532556
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
557+
@Diseases(value = {
558+
Disease.MALARIA }, hide = true)
533559
private String quarantineHomeSupplyEnsuredComment;
560+
@Diseases(value = {
561+
Disease.MALARIA }, hide = true)
534562
private boolean quarantineExtended;
563+
@Diseases(value = {
564+
Disease.MALARIA }, hide = true)
535565
private boolean quarantineReduced;
536566
@HideForCountriesExcept(countries = {
537567
COUNTRY_CODE_GERMANY,
538568
COUNTRY_CODE_SWITZERLAND })
569+
@Diseases(value = {
570+
Disease.MALARIA }, hide = true)
539571
private boolean quarantineOfficialOrderSent;
540572
@HideForCountriesExcept(countries = {
541573
COUNTRY_CODE_GERMANY,
542574
COUNTRY_CODE_SWITZERLAND })
575+
@Diseases(value = {
576+
Disease.MALARIA }, hide = true)
543577
private Date quarantineOfficialOrderSentDate;
544578
@SensitiveData
545579
private YesNoUnknown postpartum;
@@ -638,6 +672,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
638672
private Date previousQuarantineTo;
639673
@SensitiveData
640674
@Size(max = CHARACTER_LIMIT_BIG, message = Validations.textTooLong)
675+
@Diseases(value = {
676+
Disease.MALARIA }, hide = true)
641677
private String quarantineChangeComment;
642678

643679
private Map<String, String> externalData;

0 commit comments

Comments
 (0)