Skip to content

Commit fd969ef

Browse files
KarnaiahPesulaKarnaiahPesula
authored
Merge pull request #13389 from SORMAS-Foundation/13349-enhance-therapy-form-for-imi-specific-disease
Therapy changes for IMI & IPI
2 parents fdb6573 + 7f491f1 commit fd969ef

14 files changed

Lines changed: 358 additions & 50 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ public interface Captions {
666666
String CaseData_classificationUser = "CaseData.classificationUser";
667667
String CaseData_classifiedBy = "CaseData.classifiedBy";
668668
String CaseData_clinicalConfirmation = "CaseData.clinicalConfirmation";
669+
String CaseData_clinicalConfirmation_PERTUSSIS = "CaseData.clinicalConfirmation.PERTUSSIS";
669670
String CaseData_clinicalCourse = "CaseData.clinicalCourse";
670671
String CaseData_clinicianEmail = "CaseData.clinicianEmail";
671672
String CaseData_clinicianName = "CaseData.clinicianName";
@@ -2225,10 +2226,10 @@ public interface Captions {
22252226
String PathogenTest_seroGroupSpecification = "PathogenTest.seroGroupSpecification";
22262227
String PathogenTest_seroGroupSpecificationText = "PathogenTest.seroGroupSpecificationText";
22272228
String PathogenTest_serotype = "PathogenTest.serotype";
2228-
String PathogenTest_specie = "PathogenTest.specie";
2229-
String PathogenTest_strainCallStatus = "PathogenTest.strainCallStatus";
22302229
String PathogenTest_seroTypingMethod = "PathogenTest.seroTypingMethod";
22312230
String PathogenTest_seroTypingMethodText = "PathogenTest.seroTypingMethodText";
2231+
String PathogenTest_specie = "PathogenTest.specie";
2232+
String PathogenTest_strainCallStatus = "PathogenTest.strainCallStatus";
22322233
String PathogenTest_testDateTime = "PathogenTest.testDateTime";
22332234
String PathogenTest_testedDisease = "PathogenTest.testedDisease";
22342235
String PathogenTest_testedDiseaseDetails = "PathogenTest.testedDiseaseDetails";
@@ -2789,6 +2790,7 @@ public interface Captions {
27892790
String Symptoms_anorexiaAppetiteLoss = "Symptoms.anorexiaAppetiteLoss";
27902791
String Symptoms_anxietyStates = "Symptoms.anxietyStates";
27912792
String Symptoms_apnoea = "Symptoms.apnoea";
2793+
String Symptoms_apnoea_PERTUSSIS = "Symptoms.apnoea.PERTUSSIS";
27922794
String Symptoms_arthritis = "Symptoms.arthritis";
27932795
String Symptoms_ascendingFlaccidParalysis = "Symptoms.ascendingFlaccidParalysis";
27942796
String Symptoms_asymptomatic = "Symptoms.asymptomatic";
@@ -2822,6 +2824,7 @@ public interface Captions {
28222824
String Symptoms_cough = "Symptoms.cough";
28232825
String Symptoms_coughingBlood = "Symptoms.coughingBlood";
28242826
String Symptoms_coughingBouts = "Symptoms.coughingBouts";
2827+
String Symptoms_coughingBouts_PERTUSSIS = "Symptoms.coughingBouts.PERTUSSIS";
28252828
String Symptoms_coughsProvokeVomiting = "Symptoms.coughsProvokeVomiting";
28262829
String Symptoms_coughWithHeamoptysis = "Symptoms.coughWithHeamoptysis";
28272830
String Symptoms_coughWithoutSputum = "Symptoms.coughWithoutSputum";
@@ -2910,6 +2913,7 @@ public interface Captions {
29102913
String Symptoms_musclePain = "Symptoms.musclePain";
29112914
String Symptoms_nausea = "Symptoms.nausea";
29122915
String Symptoms_neckStiffness = "Symptoms.neckStiffness";
2916+
String Symptoms_nocturnalCough = "Symptoms.nocturnalCough";
29132917
String Symptoms_noseBleeding = "Symptoms.noseBleeding";
29142918
String Symptoms_oedemaFaceNeck = "Symptoms.oedemaFaceNeck";
29152919
String Symptoms_oedemaLowerExtremity = "Symptoms.oedemaLowerExtremity";

‎sormas-api/src/main/java/de/symeda/sormas/api/therapy/Drug.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,19 @@ public enum Drug {
6666
RIFAMPICIN,
6767
@DrugTypes(value = {
6868
TypeOfDrug.ANTIBIOTIC })
69-
STREPTOMYCIN;
69+
STREPTOMYCIN,
70+
@DrugTypes(value = {
71+
TypeOfDrug.ANTIBIOTIC })
72+
CEFTRIAXONE,
73+
@DrugTypes(value = {
74+
TypeOfDrug.ANTIBIOTIC })
75+
PENICILLIN,
76+
@DrugTypes(value = {
77+
TypeOfDrug.ANTIBIOTIC })
78+
ERYTHROMYCIN,
79+
@DrugTypes(value = {
80+
TypeOfDrug.ANTIBIOTIC })
81+
OTHER;
7082

7183
@Override
7284
public String toString() {

‎sormas-api/src/main/java/de/symeda/sormas/api/therapy/DrugSusceptibilityDto.java‎

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ public class DrugSusceptibilityDto extends PseudonymizableDto {
6161
public static final String RIFAMPICIN_SUSCEPTIBILITY = "rifampicinSusceptibility";
6262
public static final String STREPTOMYCIN_MIC = "streptomycinMic";
6363
public static final String STREPTOMYCIN_SUSCEPTIBILITY = "streptomycinSusceptibility";
64+
public static final String CEFTRIAXONE_MIC = "ceftriaxoneMic";
65+
public static final String CEFTRIAXONE_SUSCEPTIBILITY = "ceftriaxoneSusceptibility";
66+
public static final String PENICILLIN_MIC = "penicillinMic";
67+
public static final String PENICILLIN_SUSCEPTIBILITY = "penicillinSusceptibility";
68+
public static final String ERYTHROMYCIN_MIC = "erythromycinMic";
69+
public static final String ERYTHROMYCIN_SUSCEPTIBILITY = "erythromycinSusceptibility";
70+
6471

6572
@Diseases(value = {
6673
Disease.TUBERCULOSIS })
@@ -93,12 +100,12 @@ public class DrugSusceptibilityDto extends PseudonymizableDto {
93100
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
94101
private DrugSusceptibilityType capreomycinSusceptibility;
95102
@Diseases(value = {
96-
Disease.TUBERCULOSIS })
103+
Disease.TUBERCULOSIS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION })
97104
@ApplicableToPathogenTests(value = {
98105
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
99106
private Float ciprofloxacinMic;
100107
@Diseases(value = {
101-
Disease.TUBERCULOSIS })
108+
Disease.TUBERCULOSIS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION })
102109
@ApplicableToPathogenTests(value = {
103110
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
104111
private DrugSusceptibilityType ciprofloxacinSusceptibility;
@@ -185,13 +192,13 @@ public class DrugSusceptibilityDto extends PseudonymizableDto {
185192
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
186193
private DrugSusceptibilityType ofloxacinSusceptibility;
187194
@Diseases(value = {
188-
Disease.TUBERCULOSIS })
195+
Disease.TUBERCULOSIS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION })
189196
@ApplicableToPathogenTests(value = {
190197
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY,
191198
PathogenTestType.PCR_RT_PCR })
192199
private Float rifampicinMic;
193200
@Diseases(value = {
194-
Disease.TUBERCULOSIS })
201+
Disease.TUBERCULOSIS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION })
195202
@ApplicableToPathogenTests(value = {
196203
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY,
197204
PathogenTestType.PCR_RT_PCR })
@@ -207,6 +214,39 @@ public class DrugSusceptibilityDto extends PseudonymizableDto {
207214
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
208215
private DrugSusceptibilityType streptomycinSusceptibility;
209216

217+
@Diseases(value = {
218+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION })
219+
@ApplicableToPathogenTests(value = {
220+
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
221+
private Float ceftriaxoneMic;
222+
@Diseases(value = {
223+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION })
224+
@ApplicableToPathogenTests(value = {
225+
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
226+
private DrugSusceptibilityType ceftriaxoneSusceptibility;
227+
228+
@Diseases(value = {
229+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION })
230+
@ApplicableToPathogenTests(value = {
231+
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
232+
private Float penicillinMic;
233+
@Diseases(value = {
234+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION })
235+
@ApplicableToPathogenTests(value = {
236+
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
237+
private DrugSusceptibilityType penicillinSusceptibility;
238+
239+
@Diseases(value = {
240+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION })
241+
@ApplicableToPathogenTests(value = {
242+
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
243+
private Float erythromycinMic;
244+
@Diseases(value = {
245+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION })
246+
@ApplicableToPathogenTests(value = {
247+
PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY })
248+
private DrugSusceptibilityType erythromycinSusceptibility;
249+
210250
public static DrugSusceptibilityDto build() {
211251
DrugSusceptibilityDto drugSusceptibility = new DrugSusceptibilityDto();
212252
drugSusceptibility.setUuid(DataHelper.createUuid());
@@ -436,4 +476,52 @@ public DrugSusceptibilityType getStreptomycinSusceptibility() {
436476
public void setStreptomycinSusceptibility(DrugSusceptibilityType streptomycinSusceptibility) {
437477
this.streptomycinSusceptibility = streptomycinSusceptibility;
438478
}
479+
480+
public Float getCeftriaxoneMic() {
481+
return ceftriaxoneMic;
482+
}
483+
484+
public void setCeftriaxoneMic(Float ceftriaxoneMic) {
485+
this.ceftriaxoneMic = ceftriaxoneMic;
486+
}
487+
488+
public DrugSusceptibilityType getCeftriaxoneSusceptibility() {
489+
return ceftriaxoneSusceptibility;
490+
}
491+
492+
public void setCeftriaxoneSusceptibility(DrugSusceptibilityType ceftriaxoneSusceptibility) {
493+
this.ceftriaxoneSusceptibility = ceftriaxoneSusceptibility;
494+
}
495+
496+
public Float getPenicillinMic() {
497+
return penicillinMic;
498+
}
499+
500+
public void setPenicillinMic(Float penicillinMic) {
501+
this.penicillinMic = penicillinMic;
502+
}
503+
504+
public DrugSusceptibilityType getPenicillinSusceptibility() {
505+
return penicillinSusceptibility;
506+
}
507+
508+
public void setPenicillinSusceptibility(DrugSusceptibilityType penicillinSusceptibility) {
509+
this.penicillinSusceptibility = penicillinSusceptibility;
510+
}
511+
512+
public Float getErythromycinMic() {
513+
return erythromycinMic;
514+
}
515+
516+
public void setErythromycinMic(Float erythromycinMic) {
517+
this.erythromycinMic = erythromycinMic;
518+
}
519+
520+
public DrugSusceptibilityType getErythromycinSusceptibility() {
521+
return erythromycinSusceptibility;
522+
}
523+
524+
public void setErythromycinSusceptibility(DrugSusceptibilityType erythromycinSusceptibility) {
525+
this.erythromycinSusceptibility = erythromycinSusceptibility;
526+
}
439527
}

‎sormas-api/src/main/java/de/symeda/sormas/api/therapy/DrugSusceptibilityType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public enum DrugSusceptibilityType {
2323
NOT_APPLICABLE,
2424
RESISTANT,
2525
SUSCEPTIBLE,
26+
INTERMEDIATE,
2627
UNKNOWN;
2728

2829
@Override

‎sormas-api/src/main/java/de/symeda/sormas/api/utils/AnnotationFieldHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static List<String> getFieldNamesWithMatchingDiseaseAndTestAnnotations(
5555
}
5656

5757
// Check @ApplicableToPathogenTests annotation
58-
if (!matches && pathogenTestTypes != null && !pathogenTestTypes.isEmpty()) {
58+
if (matches && pathogenTestTypes != null && !pathogenTestTypes.isEmpty()) {
5959
ApplicableToPathogenTests pathogenTestsAnnotation = field.getAnnotation(ApplicableToPathogenTests.class);
6060
if (pathogenTestsAnnotation != null) {
6161
List<PathogenTestType> fieldTestTypes = Arrays.asList(pathogenTestsAnnotation.value());

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@ CaseData.changeDate=Date of last change
576576
CaseData.creationDate=Creation date
577577
CaseData.radiographyCompatibility=Radiography
578578
CaseData.otherDiagnosticCriteria=Other diagnostic details
579+
580+
CaseData.clinicalConfirmation.PERTUSSIS= OR any person diagnosed as pertussis by a physician
579581
# CaseExport
580582
CaseExport.address=Address
581583
CaseExport.addressRegion=Address Region
@@ -2727,6 +2729,8 @@ Symptoms.congenitalHeartDiseaseDetails=Specify
27272729
Symptoms.conjunctivitis=Conjunctivitis (red eyes)
27282730
Symptoms.cough=Cough
27292731
Symptoms.coughingBouts=Coughing bouts
2732+
Symptoms.coughingBouts.PERTUSSIS=Any person with a cough lasting at least two weeks AND \n At least one of : Paroxysms of coughing/ Inspiratory ?whooping?/ Post-tussive vomiting.
2733+
Symptoms.apnoea.PERTUSSIS=OR Apnoeic episodes in infants
27302734
Symptoms.coughsProvokeVomiting=Coughs provoke vomiting
27312735
Symptoms.coughWithSputum=Cough with sputum
27322736
Symptoms.coughWithHeamoptysis=Cough with heamoptysis
@@ -2790,7 +2794,7 @@ Symptoms.lymphadenopathyAxillary=Enlarged lymph nodes, axillary
27902794
Symptoms.lymphadenopathyCervical=Enlarged lymph nodes, cervical
27912795
Symptoms.lymphadenopathyInguinal=Enlarged lymph nodes, inguinal
27922796
Symptoms.malaise=Malaise
2793-
Symptoms.meningealSigns=Meningeal signs
2797+
Symptoms.meningealSigns=Meningeal Signs
27942798
Symptoms.meningoencephalitis=Meningoencephalitis
27952799
Symptoms.microcephaly=Microcephaly
27962800
Symptoms.midUpperArmCircumference=Mid-upper arm circumf. (cm)
@@ -2896,6 +2900,7 @@ Symptoms.hemorrhagicRash=Hemorrhagic Rash
28962900
Symptoms.arthritis=Septic Arthritis
28972901
Symptoms.meningitis=Meningitis
28982902
Symptoms.septicaemia=Septicaemia
2903+
Symptoms.nocturnalCough= Nocturnal Cough
28992904
Symptoms.otherClinicalPresentation=Other Clinical Presentation Symptoms
29002905
Symptoms.otherClinicalPresentationText=Specify Other Symptoms
29012906
Symptoms.imi.shock=Septic Shock

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,11 +1478,16 @@ Drug.MOXIFLOXACIN = Moxifloxacin
14781478
Drug.OFLOXACIN = Ofloxacin
14791479
Drug.RIFAMPICIN = Rifampicin
14801480
Drug.STREPTOMYCIN =Streptomycin
1481+
Drug.CEFTRIAXONE = Ceftriaxone
1482+
Drug.PENICILLIN = Penicillin
1483+
Drug.ERYTHROMYCIN = Erythromycin
1484+
Drug.OTHER = Other
14811485

14821486
DrugSusceptibilityType.NOT_APPLICABLE = Not applicable
14831487
DrugSusceptibilityType.RESISTANT = Resistant
14841488
DrugSusceptibilityType.SUSCEPTIBLE = Susceptible
14851489
DrugSusceptibilityType.UNKNOWN = Unknown
1490+
DrugSusceptibilityType.INTERMEDIATE = Intermediate
14861491

14871492
# TypeOfPlace
14881493
TypeOfPlace.FACILITY = Facility

‎sormas-backend/src/main/java/de/symeda/sormas/backend/therapy/DrugSusceptibility.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ public class DrugSusceptibility extends AbstractDomainObject {
5959
public static final String RIFAMPICIN_SUSCEPTIBILITY = "rifampicinSusceptibility";
6060
public static final String STREPTOMYCIN_MIC = "streptomycinMic";
6161
public static final String STREPTOMYCIN_SUSCEPTIBILITY = "streptomycinSusceptibility";
62+
public static final String CEFTRIAXONE_MIC = "ceftriaxoneMic";
63+
public static final String CEFTRIAXONE_SUSCEPTIBILITY = "ceftriaxoneSusceptibility";
64+
public static final String PENICILLIN_MIC = "penicillinMic";
65+
public static final String PENICILLIN_SUSCEPTIBILITY = "penicillinSusceptibility";
66+
public static final String ERYTHROMYCIN_MIC = "erythromycinMic";
67+
public static final String ERYTHROMYCIN_SUSCEPTIBILITY = "erythromycinSusceptibility";
6268

6369
private Float amikacinMic;
6470
private DrugSusceptibilityType amikacinSusceptibility;
@@ -88,6 +94,12 @@ public class DrugSusceptibility extends AbstractDomainObject {
8894
private DrugSusceptibilityType rifampicinSusceptibility;
8995
private Float streptomycinMic;
9096
private DrugSusceptibilityType streptomycinSusceptibility;
97+
private Float ceftriaxoneMic;
98+
private DrugSusceptibilityType ceftriaxoneSusceptibility;
99+
private Float penicillinMic;
100+
private DrugSusceptibilityType penicillinSusceptibility;
101+
private Float erythromycinMic;
102+
private DrugSusceptibilityType erythromycinSusceptibility;
91103

92104
public Float getAmikacinMic() {
93105
return amikacinMic;
@@ -326,4 +338,55 @@ public DrugSusceptibilityType getStreptomycinSusceptibility() {
326338
public void setStreptomycinSusceptibility(DrugSusceptibilityType streptomycinSusceptibility) {
327339
this.streptomycinSusceptibility = streptomycinSusceptibility;
328340
}
341+
342+
public Float getCeftriaxoneMic() {
343+
return ceftriaxoneMic;
344+
}
345+
346+
public void setCeftriaxoneMic(Float ceftriaxoneMic) {
347+
this.ceftriaxoneMic = ceftriaxoneMic;
348+
}
349+
350+
@Enumerated(EnumType.STRING)
351+
public DrugSusceptibilityType getCeftriaxoneSusceptibility() {
352+
return ceftriaxoneSusceptibility;
353+
}
354+
355+
public void setCeftriaxoneSusceptibility(DrugSusceptibilityType ceftriaxoneSusceptibility) {
356+
this.ceftriaxoneSusceptibility = ceftriaxoneSusceptibility;
357+
}
358+
359+
public Float getPenicillinMic() {
360+
return penicillinMic;
361+
}
362+
363+
public void setPenicillinMic(Float penicillinMic) {
364+
this.penicillinMic = penicillinMic;
365+
}
366+
367+
@Enumerated(EnumType.STRING)
368+
public DrugSusceptibilityType getPenicillinSusceptibility() {
369+
return penicillinSusceptibility;
370+
}
371+
372+
public void setPenicillinSusceptibility(DrugSusceptibilityType penicillinSusceptibility) {
373+
this.penicillinSusceptibility = penicillinSusceptibility;
374+
}
375+
376+
public Float getErythromycinMic() {
377+
return erythromycinMic;
378+
}
379+
380+
public void setErythromycinMic(Float erythromycinMic) {
381+
this.erythromycinMic = erythromycinMic;
382+
}
383+
384+
@Enumerated(EnumType.STRING)
385+
public DrugSusceptibilityType getErythromycinSusceptibility() {
386+
return erythromycinSusceptibility;
387+
}
388+
389+
public void setErythromycinSusceptibility(DrugSusceptibilityType erythromycinSusceptibility) {
390+
this.erythromycinSusceptibility = erythromycinSusceptibility;
391+
}
329392
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/therapy/DrugSusceptibilityMapper.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@ public static DrugSusceptibilityDto toDto(DrugSusceptibility source) {
6363
target.setRifampicinSusceptibility(source.getRifampicinSusceptibility());
6464
target.setStreptomycinMic(source.getStreptomycinMic());
6565
target.setStreptomycinSusceptibility(source.getStreptomycinSusceptibility());
66-
66+
target.setCeftriaxoneMic(source.getCeftriaxoneMic());
67+
target.setCeftriaxoneSusceptibility(source.getCeftriaxoneSusceptibility());
68+
target.setPenicillinMic(source.getPenicillinMic());
69+
target.setPenicillinSusceptibility(source.getPenicillinSusceptibility());
70+
target.setErythromycinMic(source.getErythromycinMic());
71+
target.setErythromycinSusceptibility(source.getErythromycinSusceptibility());
6772
return target;
6873
}
6974

@@ -102,6 +107,12 @@ public DrugSusceptibility fillOrBuildEntity(@NotNull DrugSusceptibilityDto sourc
102107
target.setRifampicinSusceptibility(source.getRifampicinSusceptibility());
103108
target.setStreptomycinMic(source.getStreptomycinMic());
104109
target.setStreptomycinSusceptibility(source.getStreptomycinSusceptibility());
110+
target.setCeftriaxoneMic(source.getCeftriaxoneMic());
111+
target.setCeftriaxoneSusceptibility(source.getCeftriaxoneSusceptibility());
112+
target.setPenicillinMic(source.getPenicillinMic());
113+
target.setPenicillinSusceptibility(source.getPenicillinSusceptibility());
114+
target.setErythromycinMic(source.getErythromycinMic());
115+
target.setErythromycinSusceptibility(source.getErythromycinSusceptibility());
105116

106117
return target;
107118
}
@@ -138,6 +149,12 @@ public static boolean hasData(DrugSusceptibilityDto dto) {
138149
|| dto.getRifampicinMic() != null
139150
|| dto.getRifampicinSusceptibility() != null
140151
|| dto.getStreptomycinMic() != null
141-
|| dto.getStreptomycinSusceptibility() != null;
152+
|| dto.getStreptomycinSusceptibility() != null
153+
|| dto.getCeftriaxoneMic() != null
154+
|| dto.getCeftriaxoneSusceptibility() != null
155+
|| dto.getPenicillinMic() != null
156+
|| dto.getPenicillinSusceptibility() != null
157+
|| dto.getErythromycinMic() != null
158+
|| dto.getErythromycinSusceptibility() != null;
142159
}
143160
}

0 commit comments

Comments
 (0)