From 66df1460cdfb83f412efc6c90c4d2b3ccf26cfaa Mon Sep 17 00:00:00 2001 From: cazacmarin Date: Thu, 7 Nov 2024 11:14:26 +0200 Subject: [PATCH] =?UTF-8?q?=20Configure=20and=20Restrict=20Sample=20Types?= =?UTF-8?q?=20and=20Pathogen=20Test=20Types=20for=20RSV=20=E2=80=A6=20(#13?= =?UTF-8?q?175)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Configure and Restrict Sample Types and Pathogen Test Types for RSV #13158 * Configure and Restrict Sample Types and Pathogen Test Types for RSV #13158 - after Serviu review --------- Co-authored-by: Marin --- .../sormas/api/sample/PathogenTestType.java | 36 ++++++++++++++--- .../sormas/api/sample/SampleMaterial.java | 40 +++++++++++++++---- 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java index b06c250f0b3..0eb491c7c4d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java @@ -24,38 +24,62 @@ public enum PathogenTestType { + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) ANTIBODY_DETECTION, ANTIGEN_DETECTION, RAPID_TEST, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) CULTURE, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) HISTOPATHOLOGY, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) ISOLATION, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) IGM_SERUM_ANTIBODY, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) IGG_SERUM_ANTIBODY, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) IGA_SERUM_ANTIBODY, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) INCUBATION_TIME, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) INDIRECT_FLUORESCENT_ANTIBODY, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) DIRECT_FLUORESCENT_ANTIBODY, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) MICROSCOPY, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) NEUTRALIZING_ANTIBODIES, PCR_RT_PCR, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) GRAM_STAIN, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) LATEX_AGGLUTINATION, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) CQ_VALUE_DETECTION, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) SEQUENCING, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) DNA_MICROARRAY, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) TMA, OTHER; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java index 7369d33bf82..4ec4e3fbd1e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java @@ -24,44 +24,68 @@ public enum SampleMaterial { + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) BLOOD, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) SERA, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) STOOL, NASAL_SWAB, THROAT_SWAB, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) NP_SWAB, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) RECTAL_SWAB, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) CEREBROSPINAL_FLUID, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) CRUST, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) TISSUE, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) URINE, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) CORNEA_PM, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) SALIVA, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) URINE_PM, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) NUCHAL_SKIN_BIOPSY, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) SPUTUM, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) ENDOTRACHEAL_ASPIRATE, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) BRONCHOALVEOLAR_LAVAGE, @Diseases(value = { - Disease.CORONAVIRUS }, hide = true) + Disease.CORONAVIRUS, Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) BRAIN_TISSUE, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) ANTERIOR_NARES_SWAB, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) OP_ASPIRATE, NP_ASPIRATE, + @Diseases(value = { + Disease.RESPIRATORY_SYNCYTIAL_VIRUS }, hide = true) PLEURAL_FLUID, OTHER;