Skip to content

Commit 2f38f26

Browse files
committed
bug fixes
1 parent ca262da commit 2f38f26

2 files changed

Lines changed: 47 additions & 19 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,55 +33,85 @@ public enum PathogenTestType {
3333
Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true)
3434
CULTURE,
3535
@Diseases(value = {
36-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
36+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
37+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
38+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
3739
HISTOPATHOLOGY,
3840
@Diseases(value = {
39-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
41+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
42+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
43+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
4044
ISOLATION,
4145
@Diseases(value = {
42-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
46+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
47+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
48+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
4349
IGM_SERUM_ANTIBODY,
4450
@Diseases(value = {
45-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
51+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
52+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
53+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
4654
IGG_SERUM_ANTIBODY,
4755
@Diseases(value = {
48-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
56+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
57+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
58+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
4959
IGA_SERUM_ANTIBODY,
5060
@Diseases(value = {
51-
Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
61+
Disease.CORONAVIRUS,
62+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
63+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
64+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
5265
INCUBATION_TIME,
5366
@Diseases(value = {
54-
Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
67+
Disease.CORONAVIRUS,
68+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
69+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
70+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
5571
INDIRECT_FLUORESCENT_ANTIBODY,
5672
@Diseases(value = {
57-
Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
73+
Disease.CORONAVIRUS,
74+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
75+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
76+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
5877
DIRECT_FLUORESCENT_ANTIBODY,
5978
@Diseases(value = {
6079
Disease.CORONAVIRUS,
6180
Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true)
6281
MICROSCOPY,
6382
@Diseases(value = {
64-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
83+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
84+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
85+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
6586
NEUTRALIZING_ANTIBODIES,
6687
PCR_RT_PCR,
6788
@Diseases(value = {
6889
Disease.CORONAVIRUS,
6990
Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true)
7091
GRAM_STAIN,
7192
@Diseases(value = {
72-
Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
93+
Disease.CORONAVIRUS,
94+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
95+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
96+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
7397
LATEX_AGGLUTINATION,
7498
@Diseases(value = {
75-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
99+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
100+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
101+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
76102
CQ_VALUE_DETECTION,
77103
@Diseases(value = {
78-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS}, hide = true)
104+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true)
79105
SEQUENCING,
80106
@Diseases(value = {
81-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS , Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION}, hide = true)
107+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
108+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
109+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
82110
DNA_MICROARRAY,
83111
@Diseases(value = {
84-
Disease.RESPIRATORY_SYNCYTIAL_VIRUS, Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
112+
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
113+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
114+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }, hide = true)
85115
TMA,
86116
IGRA,
87117
TST,
@@ -92,9 +122,9 @@ public enum PathogenTestType {
92122
MULTILOCUS_SEQUENCE_TYPING,
93123
SLIDE_AGGLUTINATION,
94124
WHOLE_GENOME_SEQUENCING,
95-
ANTIBIOTIC_SUSCEPTIBILITY_TESTING,
96125
@Diseases(value = {
97-
Disease.INVASIVE_MENINGOCOCCAL_INFECTION, Disease.INVASIVE_PNEUMOCOCCAL_INFECTION})
126+
Disease.INVASIVE_MENINGOCOCCAL_INFECTION,
127+
Disease.INVASIVE_PNEUMOCOCCAL_INFECTION })
98128
SEROGROUPING,
99129
OTHER;
100130

sormas-backend/src/main/java/de/symeda/sormas/backend/sample/PathogenTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
import de.symeda.sormas.api.sample.PathogenTestResultType;
4848
import de.symeda.sormas.api.sample.PathogenTestScale;
4949
import de.symeda.sormas.api.sample.PathogenTestType;
50-
import de.symeda.sormas.api.utils.YesNoUnknown;
5150
import de.symeda.sormas.api.sample.SeroGroupSpecification;
5251
import de.symeda.sormas.api.sample.SerotypingMethod;
52+
import de.symeda.sormas.api.utils.YesNoUnknown;
5353
import de.symeda.sormas.backend.common.DeletableAdo;
5454
import de.symeda.sormas.backend.environment.environmentsample.EnvironmentSample;
5555
import de.symeda.sormas.backend.infrastructure.country.Country;
@@ -158,9 +158,7 @@ public class PathogenTest extends DeletableAdo {
158158
private PathogenStrainCallStatus strainCallStatus;
159159
private PathogenTestScale testScale;
160160
private DrugSusceptibility drugSusceptibility;
161-
private SpoligotypeSpecie spoligotypeSpecie;
162161
private String miruPatternProfile;
163-
private BeijingGenotypeStatus beijingGenotypeStatus;
164162
private SerotypingMethod seroTypingMethod;
165163
private String seroTypingMethodText;
166164
private SeroGroupSpecification seroGroupSpecification;

0 commit comments

Comments
 (0)