merge

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/Disease.java

@@ -90,6 +90,7 @@ public enum Disease
 	INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false, true, 1, 10),
 	GIARDIASIS(true, true, true, false, true, 14, false, false, false, true, 7, 21),
 	CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false, true, 2, 12),
+	SHIGELLOSIS(true, true, true, false, true, 14, false, false, false, true, 1, 7),
 	SALMONELLOSIS(true, true, true, false, true, 14, false, false, false, true, 1, 3),
 	OTHER(true, true, true, false, true, 21, false, false, false, false, 0, 0),
 	UNDEFINED(true, true, true, false, true, 0, false, false, false, false, 0, 0);

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

@@ -236,7 +236,8 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	BRAIN_TISSUE,
 
 	@Diseases(value = {
@@ -247,7 +248,8 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	ANTERIOR_NARES_SWAB,
 
 	@Diseases(value = {
@@ -258,7 +260,8 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	OP_ASPIRATE,
 
 	@Diseases(value = {
@@ -267,7 +270,8 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	NP_ASPIRATE,
 
 	@Diseases(value = {
@@ -277,7 +281,8 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	PLEURAL_FLUID,
 
 	@Diseases(value = {
@@ -294,7 +299,8 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	AMNIOTIC_FLUID,
 
 	@Diseases(value = {
@@ -309,7 +315,8 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	PERITONEAL_FLUID,
 
 	@Diseases(value = {
@@ -318,13 +325,15 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE }, hide = true)
+		Disease.DENGUE,
+		Disease.SHIGELLOSIS }, hide = true)
 	SYNOVIAL_FLUID,
 
 	@Diseases(value = {
 		Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
 		Disease.GIARDIASIS,
-		Disease.CRYPTOSPORIDIOSIS }, hide = true)
+		Disease.CRYPTOSPORIDIOSIS,
+		Disease.SHIGELLOSIS }, hide = true)
 	EDTA_WHOLE_BLOOD,
 
 	@Diseases(value = {
@@ -335,6 +344,10 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS })
 	DUODENUM_FLUID,
 
+	@Diseases(value = {
+		Disease.SHIGELLOSIS })
+	PUS,
+
 	OTHER;
 
 	@Override

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

@@ -1956,7 +1956,7 @@ PathogenTest.prescriberCity=City
 PathogenTest.prescriberCountry=Country
 PathogenTest.rifampicinResistant=Rifampicin resistant
 PathogenTest.isoniazidResistant=Isoniazid resistant
-PathogenTest.specie=Specie
+PathogenTest.specie=Species
 PathogenTest.patternProfile=Pattern profile
 PathogenTest.strainCallStatus=Strain Call Status
 PathogenTest.testScale=Test Scale