Case based form 23

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

@@ -21,13 +21,14 @@
 import java.util.List;
 
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.sample.PathogenTestType;
 import de.symeda.sormas.api.statistics.StatisticsGroupingKey;
 
 public enum Disease
 	implements
 	StatisticsGroupingKey {
 
-	AFP(true, true, true, false, 0, true, false, false),
+	AFP(true, true, true, false, 60, true, false, false),
 	CHOLERA(true, true, true, true, 5, true, false, false),
 	CONGENITAL_RUBELLA(true, true, true, true, 21, true, false, false),
 	CSM(true, true, true, false, 10, true, false, false),
@@ -40,7 +41,7 @@ public enum Disease
 	NEW_INFLUENZA(true, true, true, true, 17, true, false, false),
 	PLAGUE(true, true, true, true, 7, true, false, false),
 	POLIO(true, true, true, false, 0, true, false, false),
-	UNSPECIFIED_VHF(true, true, true, true, 21, true, false, false),
+	//AHF(true, true, true, true, 21, true, false, false),
 	WEST_NILE_FEVER(true, false, true, false, 0, true, false, false),
 	YELLOW_FEVER(true, true, true, false, 6, true, false, false),
 	RABIES(true, true, true, true, 6, true, false, false),
@@ -82,11 +83,14 @@ public enum Disease
 	M_PNEUMONIAE(true, false, true, false, 0, true, false, false),
 	C_PNEUMONIAE(true, false, true, false, 0, true, false, false),
 	ARI(true, false, false, false, 0, true, false, false),
-	CHIKUNGUNYA(true, false, false, false, 0, true, false, false),
+	CHIKUNGUNYA(true, true, true, false, 0, true, false, false),
 	POST_IMMUNIZATION_ADVERSE_EVENTS_MILD(true, false, false, false, 0, true, false, false),
 	POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE(true, false, false, false, 0, true, false, false),
 	FHA(true, false, false, false, 0, true, false, false),
+	AHF(true, true, true, true, 21, true, false, false),
 	OTHER(true, true, true, true, 21, false, false, false),
+	ZIKA(true, true, true, false, 6, true, false, false),
+	MARBURG(true, true, true, false, 0, true, false, false),
 	UNDEFINED(true, true, true, true, 0, false, false, false);
 
 	private final boolean defaultActive;
@@ -163,7 +167,7 @@ public int getDefaultFollowUpDuration() {
 	}
 
 	public boolean isDiseaseGroup() {
-		return this == UNSPECIFIED_VHF;
+		return this == AHF;
 	}
 
 	public boolean isVariantAllowed() {
@@ -193,4 +197,14 @@ public int keyCompareTo(StatisticsGroupingKey o) {
 	}
 
 	public static List<Disease> DISEASE_LIST = Arrays.asList(Disease.values());
+	public static final List<Disease> AHF_DISEASES = Arrays.asList(
+			EVD,
+			MARBURG,
+			LASSA,
+			DENGUE,
+			CHIKUNGUNYA,
+			ZIKA,
+			YELLOW_FEVER
+	);
+
 }

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

@@ -80,6 +80,7 @@
 import de.symeda.sormas.api.sample.PathogenTestFacade;
 import de.symeda.sormas.api.sample.SampleFacade;
 import de.symeda.sormas.api.share.ExternalShareInfoFacade;
+import de.symeda.sormas.api.sixtyday.SixtyDayFacade;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasEncryptionFacade;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasFacade;
 import de.symeda.sormas.api.sormastosormas.caze.SormasToSormasCaseFacade;
@@ -248,6 +249,10 @@ public static HospitalizationFacade getHospitalizationFacade() {
 		return get().lookupEjbRemote(HospitalizationFacade.class);
 	}
 
+	public static SixtyDayFacade getSixtyDayFacade() {
+		return get().lookupEjbRemote(SixtyDayFacade.class);
+	}
+
 	public static EpiDataFacade getEpiDataFacade() {
 		return get().lookupEjbRemote(EpiDataFacade.class);
 	}

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

@@ -59,6 +59,11 @@ public void setUuid(String uuid) {
 		this.uuid = uuid;
 	}
 
+	public boolean getCaption(String caption) {
+		this.caption = caption;
+        return Boolean.parseBoolean(caption);
+    }
+
 	public String getCaption() {
 		return caption;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseBulkEditData.java

@@ -28,6 +28,7 @@
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto;
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
+import de.symeda.sormas.api.infrastructure.facility.DhimsFacility;
 import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityType;
 import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
@@ -57,6 +58,7 @@ public class CaseBulkEditData extends EntityDto {
 	public static final String HEALTH_FACILITY = "healthFacility";
 	public static final String HEALTH_FACILITY_DETAILS = "healthFacilityDetails";
 	public static final String FACILITY_TYPE = "facilityType";
+	public static final String DHIMS_FACILITY_TYPE = "dhimsFacilityType";
 	public static final String DONT_SHARE_WITH_REPORTING_TOOL = "dontShareWithReportingTool";
 
 	private Disease disease;
@@ -74,6 +76,7 @@ public class CaseBulkEditData extends EntityDto {
 	private DistrictReferenceDto district;
 	private CommunityReferenceDto community;
 	private FacilityType facilityType;
+	private DhimsFacility dhimsFacilityType;
 	private FacilityReferenceDto healthFacility;
 	@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
 	private String healthFacilityDetails;
@@ -191,6 +194,14 @@ public void setFacilityType(FacilityType facilityType) {
 		this.facilityType = facilityType;
 	}
 
+	public DhimsFacility getDhimsFacilityType() {
+		return dhimsFacilityType;
+	}
+
+	public void setDhimsFacilityType(DhimsFacility dhimsFacilityType) {
+		this.dhimsFacilityType = dhimsFacilityType;
+	}
+
 	public FacilityReferenceDto getHealthFacility() {
 		return healthFacility;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseClassification.java

@@ -17,12 +17,11 @@
  *******************************************************************************/
 package de.symeda.sormas.api.caze;
 
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.Set;
+import java.util.*;
 
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.statistics.StatisticsGroupingKey;
+import de.symeda.sormas.api.utils.LatexCulture;
 
 public enum CaseClassification
 	implements
@@ -81,4 +80,7 @@ public static Set<CaseClassification> getConfirmedClassifications() {
 		return Collections.unmodifiableSet(
 			EnumSet.of(CaseClassification.CONFIRMED, CaseClassification.CONFIRMED_NO_SYMPTOMS, CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS));
 	}
+
+	public static final List<CaseClassification> CASE_CLASSIFY = Arrays.asList(
+			CONFIRMED, PROBABLE, SUSPECT);
 }

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseCriteria.java

@@ -26,6 +26,7 @@
 import de.symeda.sormas.api.disease.DiseaseVariant;
 import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto;
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
+import de.symeda.sormas.api.infrastructure.facility.DhimsFacility;
 import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.infrastructure.facility.FacilityType;
 import de.symeda.sormas.api.infrastructure.facility.FacilityTypeGroup;
@@ -37,6 +38,8 @@
 import de.symeda.sormas.api.share.ExternalShareCriteria;
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.user.UserRoleReferenceDto;
+import de.symeda.sormas.api.utils.AFPFacilityOptions;
+import de.symeda.sormas.api.utils.CardOrHistory;
 import de.symeda.sormas.api.utils.DateFilterOption;
 import de.symeda.sormas.api.utils.IgnoreForUrl;
 import de.symeda.sormas.api.utils.criteria.CriteriaDateType;
@@ -74,6 +77,8 @@ public class CaseCriteria extends CriteriaWithDateType implements ExternalShareC
 	public static final String REINFECTION_STATUS = "reinfectionStatus";
 	public static final String FACILITY_TYPE_GROUP = "facilityTypeGroup";
 	public static final String FACILITY_TYPE = "facilityType";
+	public static final String DHIMS_FACILITY_TYPE = "dhimsFacilityType";
+	public static final String AFP_FACILITY_OPTIONS = "afpFacilityOptions";
 	public static final String INCLUDE_CASES_FROM_OTHER_JURISDICTIONS = "includeCasesFromOtherJurisdictions";
 	public static final String ONLY_CONTACTS_FROM_OTHER_INSTANCES = "onlyContactsFromOtherInstances";
 	public static final String ONLY_CASES_WITH_REINFECTION = "onlyCasesWithReinfection";
@@ -134,10 +139,14 @@ public class CaseCriteria extends CriteriaWithDateType implements ExternalShareC
 	private Integer followUpVisitsInterval;
 	private SymptomJournalStatus symptomJournalStatus;
 	private VaccinationStatus vaccinationStatus;
+	private CardOrHistory vaccinationType;
+	private Date vaccinationDate;
 	private ReinfectionStatus reinfectionStatus;
 	private Date reportDateTo;
 	private FacilityTypeGroup facilityTypeGroup;
 	private FacilityType facilityType;
+	private DhimsFacility dhimsFacilityType;
+	private AFPFacilityOptions afpFacilityOptions;
 	private Boolean includeCasesFromOtherJurisdictions = Boolean.FALSE;
 	private Boolean onlyContactsFromOtherInstances;
 	private Boolean onlyCasesWithReinfection;
@@ -621,10 +630,18 @@ public void setSymptomJournalStatus(SymptomJournalStatus symptomJournalStatus) {
 	public VaccinationStatus getVaccinationStatus() {
 		return vaccinationStatus;
 	}
+	public CardOrHistory getVaccinationType() {
+		return vaccinationType;
+	}
+	public Date getVaccinationDate() {
+		return vaccinationDate;
+	}
 
 	public void setVaccinationStatus(VaccinationStatus vaccinationStatus) {
 		this.vaccinationStatus = vaccinationStatus;
 	}
+	public void setVaccinationType(CardOrHistory vaccinationType) {this.vaccinationType = vaccinationType;}
+	public void setVaccinationDate(Date vaccinationDate) {this.vaccinationDate = vaccinationDate;}
 
 	public ReinfectionStatus getReinfectionStatus() {
 		return reinfectionStatus;
@@ -658,6 +675,20 @@ public void setFacilityType(FacilityType type) {
 		this.facilityType = type;
 	}
 
+	public DhimsFacility getDhimsFacilityType() {
+		return dhimsFacilityType;
+	}
+
+	public void setDhimsFacilityType(DhimsFacility dhimsFacilityType) {
+		this.dhimsFacilityType = dhimsFacilityType;
+	}
+
+	public AFPFacilityOptions getAfpFacilityOptions() {
+		return afpFacilityOptions;
+	}
+
+	public void setAfpFacilityOptions(AFPFacilityOptions afpFacilityOptions) {this.afpFacilityOptions = afpFacilityOptions;}
+
 	public Boolean getIncludeCasesFromOtherJurisdictions() {
 		return includeCasesFromOtherJurisdictions;
 	}