Skip to content

Commit 102bc57

Browse files
KarnaiahPesulaKarnaiahPesula
committed
Merge branch 'development' into bugfix-mala-deng-issues
# Conflicts: # sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java # sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java # sormas-backend/src/main/resources/sql/sormas_schema.sql
2 parents b45326c + e49575e commit 102bc57

28 files changed

Lines changed: 651 additions & 310 deletions

File tree

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -928,13 +928,11 @@ public interface Captions {
928928
String caseLabResultsDateCollected = "caseLabResultsDateCollected";
929929
String caseLabResultsDrugSusceptibilityHeading = "caseLabResultsDrugSusceptibilityHeading";
930930
String caseLabResultsMethod = "caseLabResultsMethod";
931-
String caseLabResultsMicValue = "caseLabResultsMicValue";
932931
String caseLabResultsSample = "caseLabResultsSample";
933932
String caseLabResultsSamplesHeading = "caseLabResultsSamplesHeading";
934-
String caseLabResultsSurveillanceInterpretation = "caseLabResultsSurveillanceInterpretation";
935933
String caseLabResultsTestsHeading = "caseLabResultsTestsHeading";
936934
String caseLabResultsTestsPerformed = "caseLabResultsTestsPerformed";
937-
String caseLabResultsZoneDiameter = "caseLabResultsZoneDiameter";
935+
String caseLabResultsValue = "caseLabResultsValue";
938936
String caseLinkToSamples = "caseLinkToSamples";
939937
String caseMergeDuplicates = "caseMergeDuplicates";
940938
String caseMinusDays = "caseMinusDays";
@@ -2425,7 +2423,6 @@ public interface Captions {
24252423
String PathogenTest_prescriberPhysicianCode = "PathogenTest.prescriberPhysicianCode";
24262424
String PathogenTest_prescriberPostalCode = "PathogenTest.prescriberPostalCode";
24272425
String PathogenTest_quantitativeBoolean = "PathogenTest.quantitativeBoolean";
2428-
String PathogenTest_quantitativeText = "PathogenTest.quantitativeText";
24292426
String PathogenTest_quantitativeUnit = "PathogenTest.quantitativeUnit";
24302427
String PathogenTest_quantitativeValue = "PathogenTest.quantitativeValue";
24312428
String PathogenTest_reportDate = "PathogenTest.reportDate";
@@ -3305,6 +3302,7 @@ public interface Captions {
33053302
String Symptoms_uproariousness = "Symptoms.uproariousness";
33063303
String Symptoms_urinaryRetention = "Symptoms.urinaryRetention";
33073304
String Symptoms_vomiting = "Symptoms.vomiting";
3305+
String Symptoms_wateryDiarrhea = "Symptoms.wateryDiarrhea";
33083306
String Symptoms_weakness = "Symptoms.weakness";
33093307
String Symptoms_weight = "Symptoms.weight";
33103308
String Symptoms_weightLoss = "Symptoms.weightLoss";

‎sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenSpecie.java‎

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ public enum PathogenSpecie {
5757
PathogenTestType.THIN_BLOOD_SMEAR,
5858
PathogenTestType.RAPID_TEST,
5959
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
60+
PathogenTestType.IGM_SERUM_ANTIBODY,
61+
PathogenTestType.IGG_SERUM_ANTIBODY,
62+
PathogenTestType.IGA_SERUM_ANTIBODY,
6063
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
6164
PathogenTestType.PCR_RT_PCR,
6265
PathogenTestType.Q_PCR,
@@ -70,6 +73,9 @@ public enum PathogenSpecie {
7073
PathogenTestType.THIN_BLOOD_SMEAR,
7174
PathogenTestType.RAPID_TEST,
7275
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
76+
PathogenTestType.IGM_SERUM_ANTIBODY,
77+
PathogenTestType.IGG_SERUM_ANTIBODY,
78+
PathogenTestType.IGA_SERUM_ANTIBODY,
7379
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
7480
PathogenTestType.PCR_RT_PCR,
7581
PathogenTestType.Q_PCR,
@@ -83,6 +89,9 @@ public enum PathogenSpecie {
8389
PathogenTestType.THIN_BLOOD_SMEAR,
8490
PathogenTestType.RAPID_TEST,
8591
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
92+
PathogenTestType.IGM_SERUM_ANTIBODY,
93+
PathogenTestType.IGG_SERUM_ANTIBODY,
94+
PathogenTestType.IGA_SERUM_ANTIBODY,
8695
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
8796
PathogenTestType.PCR_RT_PCR,
8897
PathogenTestType.Q_PCR,
@@ -96,6 +105,9 @@ public enum PathogenSpecie {
96105
PathogenTestType.THIN_BLOOD_SMEAR,
97106
PathogenTestType.RAPID_TEST,
98107
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
108+
PathogenTestType.IGM_SERUM_ANTIBODY,
109+
PathogenTestType.IGG_SERUM_ANTIBODY,
110+
PathogenTestType.IGA_SERUM_ANTIBODY,
99111
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
100112
PathogenTestType.PCR_RT_PCR,
101113
PathogenTestType.Q_PCR,
@@ -109,6 +121,9 @@ public enum PathogenSpecie {
109121
PathogenTestType.THIN_BLOOD_SMEAR,
110122
PathogenTestType.RAPID_TEST,
111123
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
124+
PathogenTestType.IGM_SERUM_ANTIBODY,
125+
PathogenTestType.IGG_SERUM_ANTIBODY,
126+
PathogenTestType.IGA_SERUM_ANTIBODY,
112127
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
113128
PathogenTestType.PCR_RT_PCR,
114129
PathogenTestType.Q_PCR,
@@ -122,6 +137,9 @@ public enum PathogenSpecie {
122137
PathogenTestType.THIN_BLOOD_SMEAR,
123138
PathogenTestType.RAPID_TEST,
124139
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
140+
PathogenTestType.IGM_SERUM_ANTIBODY,
141+
PathogenTestType.IGG_SERUM_ANTIBODY,
142+
PathogenTestType.IGA_SERUM_ANTIBODY,
125143
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
126144
PathogenTestType.PCR_RT_PCR,
127145
PathogenTestType.Q_PCR,
@@ -135,6 +153,9 @@ public enum PathogenSpecie {
135153
PathogenTestType.THIN_BLOOD_SMEAR,
136154
PathogenTestType.RAPID_TEST,
137155
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
156+
PathogenTestType.IGM_SERUM_ANTIBODY,
157+
PathogenTestType.IGG_SERUM_ANTIBODY,
158+
PathogenTestType.IGA_SERUM_ANTIBODY,
138159
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
139160
PathogenTestType.PCR_RT_PCR,
140161
PathogenTestType.Q_PCR,
@@ -148,6 +169,9 @@ public enum PathogenSpecie {
148169
PathogenTestType.THIN_BLOOD_SMEAR,
149170
PathogenTestType.RAPID_TEST,
150171
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
172+
PathogenTestType.IGM_SERUM_ANTIBODY,
173+
PathogenTestType.IGG_SERUM_ANTIBODY,
174+
PathogenTestType.IGA_SERUM_ANTIBODY,
151175
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
152176
PathogenTestType.PCR_RT_PCR,
153177
PathogenTestType.Q_PCR,
@@ -161,6 +185,9 @@ public enum PathogenSpecie {
161185
PathogenTestType.THIN_BLOOD_SMEAR,
162186
PathogenTestType.RAPID_TEST,
163187
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
188+
PathogenTestType.IGM_SERUM_ANTIBODY,
189+
PathogenTestType.IGG_SERUM_ANTIBODY,
190+
PathogenTestType.IGA_SERUM_ANTIBODY,
164191
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
165192
PathogenTestType.PCR_RT_PCR,
166193
PathogenTestType.Q_PCR,
@@ -174,35 +201,40 @@ public enum PathogenSpecie {
174201
@ApplicableToPathogenTests(value = {
175202
PathogenTestType.SEROGROUPING,
176203
PathogenTestType.SEROTYPING,
177-
PathogenTestType.BACTERIAL_CULTURE })
204+
PathogenTestType.BACTERIAL_CULTURE,
205+
PathogenTestType.CULTURE })
178206
BOYDII,
179207
@Diseases(value = {
180208
Disease.SHIGELLOSIS })
181209
@ApplicableToPathogenTests(value = {
182210
PathogenTestType.SEROGROUPING,
183211
PathogenTestType.SEROTYPING,
184-
PathogenTestType.BACTERIAL_CULTURE })
212+
PathogenTestType.BACTERIAL_CULTURE,
213+
PathogenTestType.CULTURE })
185214
DYSENTERIAE,
186215
@Diseases(value = {
187216
Disease.SHIGELLOSIS })
188217
@ApplicableToPathogenTests(value = {
189218
PathogenTestType.SEROGROUPING,
190219
PathogenTestType.SEROTYPING,
191-
PathogenTestType.BACTERIAL_CULTURE })
220+
PathogenTestType.BACTERIAL_CULTURE,
221+
PathogenTestType.CULTURE })
192222
FLEXNERI,
193223
@Diseases(value = {
194224
Disease.SHIGELLOSIS })
195225
@ApplicableToPathogenTests(value = {
196226
PathogenTestType.SEROGROUPING,
197227
PathogenTestType.SEROTYPING,
198-
PathogenTestType.BACTERIAL_CULTURE })
228+
PathogenTestType.BACTERIAL_CULTURE,
229+
PathogenTestType.CULTURE })
199230
SONNEI,
200231
@Diseases(value = {
201232
Disease.SHIGELLOSIS })
202233
@ApplicableToPathogenTests(value = {
203234
PathogenTestType.SEROGROUPING,
204235
PathogenTestType.SEROTYPING,
205-
PathogenTestType.BACTERIAL_CULTURE })
236+
PathogenTestType.BACTERIAL_CULTURE,
237+
PathogenTestType.CULTURE })
206238
SHIGELLA_SPP,
207239
@Diseases({
208240
Disease.MALARIA,
@@ -211,13 +243,17 @@ public enum PathogenSpecie {
211243
PathogenTestType.THIN_BLOOD_SMEAR,
212244
PathogenTestType.RAPID_TEST,
213245
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
246+
PathogenTestType.IGM_SERUM_ANTIBODY,
247+
PathogenTestType.IGG_SERUM_ANTIBODY,
248+
PathogenTestType.IGA_SERUM_ANTIBODY,
214249
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
215250
PathogenTestType.PCR_RT_PCR,
216251
PathogenTestType.Q_PCR,
217252
PathogenTestType.LAMP,
218253
PathogenTestType.OTHER_MOLECULAR_ASSAY,
219254
PathogenTestType.OTHER_SEROLOGICAL_TEST,
220255
PathogenTestType.BACTERIAL_CULTURE,
256+
PathogenTestType.CULTURE,
221257
PathogenTestType.SEROGROUPING,
222258
PathogenTestType.SEROTYPING })
223259
OTHER,
@@ -231,13 +267,17 @@ public enum PathogenSpecie {
231267
PathogenTestType.THIN_BLOOD_SMEAR,
232268
PathogenTestType.RAPID_TEST,
233269
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST,
270+
PathogenTestType.IGM_SERUM_ANTIBODY,
271+
PathogenTestType.IGG_SERUM_ANTIBODY,
272+
PathogenTestType.IGA_SERUM_ANTIBODY,
234273
PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
235274
PathogenTestType.PCR_RT_PCR,
236275
PathogenTestType.Q_PCR,
237276
PathogenTestType.LAMP,
238277
PathogenTestType.OTHER_MOLECULAR_ASSAY,
239278
PathogenTestType.OTHER_SEROLOGICAL_TEST,
240279
PathogenTestType.BACTERIAL_CULTURE,
280+
PathogenTestType.CULTURE,
241281
PathogenTestType.SEROGROUPING,
242282
PathogenTestType.SEROTYPING })
243283
UNKNOWN,

‎sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ public class PathogenTestDto extends PseudonymizableDto {
131131
public static final String RESULT_DETAILS = "resultDetails";
132132
public static final String QUANTITATIVE_VALUE = "quantitativeValue";
133133
public static final String QUANTITATIVE_UNIT = "quantitativeUnit";
134-
public static final String QUANTITATIVE_TEXT = "quantitativeText";
135134
public static final String QUANTITATIVE_BOOLEAN = "quantitativeBoolean";
136135
public static final String SMEAR_GRADE = "smearGrade";
137136
public static final String WESTERN_BLOT_INTERPRETATION = "westernBlotInterpretation";
@@ -346,9 +345,6 @@ public class PathogenTestDto extends PseudonymizableDto {
346345
private Float quantitativeValue;
347346
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
348347
private String quantitativeUnit;
349-
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
350-
@SensitiveData
351-
private String quantitativeText;
352348
private YesNoUnknown quantitativeBoolean;
353349
private SmearGrade smearGrade;
354350
private WesternBlotInterpretation westernBlotInterpretation;
@@ -1014,14 +1010,6 @@ public void setQuantitativeUnit(String quantitativeUnit) {
10141010
this.quantitativeUnit = quantitativeUnit;
10151011
}
10161012

1017-
public String getQuantitativeText() {
1018-
return quantitativeText;
1019-
}
1020-
1021-
public void setQuantitativeText(String quantitativeText) {
1022-
this.quantitativeText = quantitativeText;
1023-
}
1024-
10251013
public YesNoUnknown getQuantitativeBoolean() {
10261014
return quantitativeBoolean;
10271015
}

0 commit comments

Comments
 (0)