Skip to content

Commit 2cd9182

Browse files
Deleted the duplicate pathogen test types.
1 parent bbe0de2 commit 2cd9182

2 files changed

Lines changed: 18 additions & 32 deletions

File tree

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

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -388,19 +388,6 @@ public enum PathogenTestType {
388388
@NotSelectableForNewTests
389389
ENZYME_LINKED_IMMUNOSORBENT_ASSAY,
390390

391-
@Diseases(value = {
392-
Disease.DENGUE })
393-
@PathogenTestCategoryRel(PathogenTestCategory.SEROLOGICAL_TESTS)
394-
@ResultValueTypeRel({
395-
ResultValueType.QUALITATIVE })
396-
IGG_ELISA,
397-
@Diseases(value = {
398-
Disease.DENGUE })
399-
@PathogenTestCategoryRel(PathogenTestCategory.SEROLOGICAL_TESTS)
400-
@ResultValueTypeRel({
401-
ResultValueType.QUALITATIVE })
402-
IGM_ELISA,
403-
404391
@Diseases(value = {
405392
Disease.SALMONELLOSIS,
406393
Disease.SHIGELLOSIS }, hide = true)
@@ -446,7 +433,7 @@ public enum PathogenTestType {
446433
@Diseases(value = {
447434
Disease.SALMONELLOSIS,
448435
Disease.SHIGELLOSIS,
449-
Disease.DENGUE}, hide = true)
436+
Disease.DENGUE }, hide = true)
450437
@PathogenTestCategoryRel(PathogenTestCategory.SEROLOGICAL_TESTS)
451438
@ResultValueTypeRel(ResultValueType.QUALITATIVE)
452439
RAPID_ANTIBODY_TEST,
@@ -539,7 +526,7 @@ public enum PathogenTestType {
539526

540527
@Diseases(value = {
541528
Disease.SHIGELLOSIS,
542-
Disease.DENGUE }, hide = true)
529+
Disease.DENGUE }, hide = true)
543530
@PathogenTestCategoryRel(PathogenTestCategory.CULTURE_AND_ISOLATION)
544531
@ResultValueTypeRel(ResultValueType.TEXT)
545532
MALDI_TOF,
@@ -573,23 +560,23 @@ public enum PathogenTestType {
573560
@Diseases(value = {
574561
Disease.SALMONELLOSIS,
575562
Disease.SHIGELLOSIS,
576-
Disease.DENGUE}, hide = true)
563+
Disease.DENGUE }, hide = true)
577564
@PathogenTestCategoryRel(PathogenTestCategory.MICROSCOPY_AND_STAINING)
578565
@ResultValueTypeRel(ResultValueType.SMEAR_GRADE)
579566
ACID_FAST_STAIN,
580567

581568
@Diseases(value = {
582569
Disease.SALMONELLOSIS,
583570
Disease.SHIGELLOSIS,
584-
Disease.DENGUE}, hide = true)
571+
Disease.DENGUE }, hide = true)
585572
@PathogenTestCategoryRel(PathogenTestCategory.MICROSCOPY_AND_STAINING)
586573
@ResultValueTypeRel(ResultValueType.QUALITATIVE)
587574
DARK_FIELD_MICROSCOPY,
588575

589576
@Diseases(value = {
590577
Disease.SALMONELLOSIS,
591578
Disease.SHIGELLOSIS,
592-
Disease.DENGUE}, hide = true)
579+
Disease.DENGUE }, hide = true)
593580
@PathogenTestCategoryRel(PathogenTestCategory.MICROSCOPY_AND_STAINING)
594581
@ResultValueTypeRel({
595582
ResultValueType.QUALITATIVE,
@@ -614,7 +601,7 @@ public enum PathogenTestType {
614601
@Diseases(value = {
615602
Disease.SALMONELLOSIS,
616603
Disease.SHIGELLOSIS,
617-
Disease.DENGUE}, hide = true)
604+
Disease.DENGUE }, hide = true)
618605
@PathogenTestCategoryRel(PathogenTestCategory.MICROSCOPY_AND_STAINING)
619606
@ResultValueTypeRel({
620607
ResultValueType.QUALITATIVE,
@@ -624,23 +611,23 @@ public enum PathogenTestType {
624611
@Diseases(value = {
625612
Disease.SALMONELLOSIS,
626613
Disease.SHIGELLOSIS,
627-
Disease.DENGUE}, hide = true)
614+
Disease.DENGUE }, hide = true)
628615
@PathogenTestCategoryRel(PathogenTestCategory.MICROSCOPY_AND_STAINING)
629616
@ResultValueTypeRel(ResultValueType.QUALITATIVE)
630617
IMMUNOHISTOCHEMISTRY,
631618

632619
@Diseases(value = {
633620
Disease.SALMONELLOSIS,
634621
Disease.SHIGELLOSIS,
635-
Disease.DENGUE}, hide = true)
622+
Disease.DENGUE }, hide = true)
636623
@PathogenTestCategoryRel(PathogenTestCategory.MICROSCOPY_AND_STAINING)
637624
@ResultValueTypeRel(ResultValueType.QUALITATIVE)
638625
ELECTRON_MICROSCOPY,
639626

640627
@Diseases(value = {
641628
Disease.SALMONELLOSIS,
642629
Disease.SHIGELLOSIS,
643-
Disease.DENGUE}, hide = true)
630+
Disease.DENGUE }, hide = true)
644631
@PathogenTestCategoryRel(PathogenTestCategory.MICROSCOPY_AND_STAINING)
645632
@ResultValueTypeRel({
646633
ResultValueType.QUALITATIVE,
@@ -684,7 +671,7 @@ public enum PathogenTestType {
684671
@Diseases(value = {
685672
Disease.SALMONELLOSIS,
686673
Disease.SHIGELLOSIS,
687-
Disease.DENGUE}, hide = true)
674+
Disease.DENGUE }, hide = true)
688675
@PathogenTestCategoryRel(PathogenTestCategory.ANTIMICROBIAL_SUSCEPTIBILITY_TESTING)
689676
@ResultValueTypeRel(ResultValueType.BOOLEAN)
690677
GENOTYPIC_RESISTANCE_TEST,
@@ -712,7 +699,7 @@ public enum PathogenTestType {
712699
@Diseases(value = {
713700
Disease.SALMONELLOSIS,
714701
Disease.SHIGELLOSIS,
715-
Disease.DENGUE}, hide = true)
702+
Disease.DENGUE }, hide = true)
716703
FLOW_CYTOMETRY,
717704

718705
// ----------------------------------------------------------------------------------------------
@@ -864,18 +851,19 @@ public static boolean isSelectableForNewTests(PathogenTestType testType) {
864851
* the generic numeric value/unit fields when the Cq input applies. Both call sites must use this method so
865852
* the rule cannot drift.
866853
*
867-
* <p>The Cq input applies for {@code PCR_RT_PCR}, {@code CQ_VALUE_DETECTION}, or {@code Q_PCR} on Malaria
854+
* <p>
855+
* The Cq input applies for {@code PCR_RT_PCR}, {@code CQ_VALUE_DETECTION}, or {@code Q_PCR} on Malaria
868856
* — except for Tuberculosis, which historically does not offer a Cq value.
869857
*
870-
* @param disease the tested disease (may be {@code null})
871-
* @param testType the test method (may be {@code null})
858+
* @param disease
859+
* the tested disease (may be {@code null})
860+
* @param testType
861+
* the test method (may be {@code null})
872862
*/
873863
public static boolean cqInputApplies(Disease disease, PathogenTestType testType) {
874864
if (disease == Disease.TUBERCULOSIS) {
875865
return false;
876866
}
877-
return testType == PCR_RT_PCR
878-
|| testType == CQ_VALUE_DETECTION
879-
|| (disease == Disease.MALARIA && testType == Q_PCR);
867+
return testType == PCR_RT_PCR || testType == CQ_VALUE_DETECTION || (disease == Disease.MALARIA && testType == Q_PCR);
880868
}
881869
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,8 +1311,6 @@ PathogenTestType.FLOW_CYTOMETRY = Flow Cytometry
13111311
PathogenTestType.OTHER_ANTIGEN_DETECTION_TEST = Other antigen detection test
13121312
PathogenTestType.OTHER_MOLECULAR_ASSAY = Other molecular assay
13131313
PathogenTestType.OTHER_SEROLOGICAL_TEST = Other serological test
1314-
PathogenTestType.IGG_ELISA=IgG ELISA
1315-
PathogenTestType.IGM_ELISA=IgM ELISA
13161314

13171315
PCRTestSpecification.VARIANT_SPECIFIC = Variant specific
13181316
PCRTestSpecification.N501Y_MUTATION_DETECTION = N501Y mutation detection

0 commit comments

Comments
 (0)