Merge remote-tracking branch 'origin/development' into 3416_SurvNet-nosocomial-outbreak

Author: lgal

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

@@ -115,6 +115,8 @@ Map<PresentCondition, Long> getCaseCountPerPersonCondition(
 
 	Date getOldestCaseReportDate();
 
+	Date getOldestCaseOutcomeDate();
+
 	boolean isArchived(String caseUuid);
 
 	boolean isDeleted(String caseUuid);

sormas-api/src/main/java/de/symeda/sormas/api/contact/FollowUpStatusDto.java

@@ -0,0 +1,34 @@
+package de.symeda.sormas.api.contact;
+
+import java.io.Serializable;
+
+public class FollowUpStatusDto implements Serializable {
+
+	private static final long serialVersionUID = 6075542609471404489L;
+
+	private String uuid;
+	private FollowUpStatus followUpStatus;
+
+	public FollowUpStatusDto(String uuid, FollowUpStatus followUpStatus) {
+
+		this.uuid = uuid;
+		this.followUpStatus = followUpStatus;
+
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public FollowUpStatus getFollowUpStatus() {
+		return followUpStatus;
+	}
+
+	public void setFollowUpStatus(FollowUpStatus followUpStatus) {
+		this.followUpStatus = followUpStatus;
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/person/JournalPersonDto.java

@@ -1,10 +1,12 @@
 package de.symeda.sormas.api.person;
 
+import de.symeda.sormas.api.contact.FollowUpStatus;
 import de.symeda.sormas.api.utils.PersonalData;
 import de.symeda.sormas.api.utils.SensitiveData;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 
 import de.symeda.sormas.api.utils.PersonalData;
 import de.symeda.sormas.api.utils.SensitiveData;
@@ -31,8 +33,8 @@ public class JournalPersonDto implements Serializable {
 	private Integer birthdateYYYY;
 
 	private Sex sex;
-	@SensitiveData
 	private Date latestFollowUpEndDate;
+	private FollowUpStatus followUpStatus;
 
 	public String getUuid() {
 		return uuid;
@@ -122,4 +124,54 @@ public void setLatestFollowUpEndDate(Date latestFollowUpEndDate) {
 		this.latestFollowUpEndDate = latestFollowUpEndDate;
 	}
 
+	public FollowUpStatus getFollowUpStatus() {
+		return followUpStatus;
+	}
+
+	public void setFollowUpStatus(FollowUpStatus followUpStatus) {
+		this.followUpStatus = followUpStatus;
+	}
+
+	@Override
+	public String toString() {
+		return uuid + ' ' + firstName + ' ' + lastName;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		JournalPersonDto that = (JournalPersonDto) o;
+		return pseudonymized == that.pseudonymized
+			&& Objects.equals(uuid, that.uuid)
+			&& Objects.equals(firstName, that.firstName)
+			&& Objects.equals(lastName, that.lastName)
+			&& Objects.equals(emailAddress, that.emailAddress)
+			&& Objects.equals(phone, that.phone)
+			&& Objects.equals(birthdateDD, that.birthdateDD)
+			&& Objects.equals(birthdateMM, that.birthdateMM)
+			&& Objects.equals(birthdateYYYY, that.birthdateYYYY)
+			&& sex == that.sex
+			&& Objects.equals(latestFollowUpEndDate, that.latestFollowUpEndDate)
+			&& followUpStatus == that.followUpStatus;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(
+			uuid,
+			pseudonymized,
+			firstName,
+			lastName,
+			emailAddress,
+			phone,
+			birthdateDD,
+			birthdateMM,
+			birthdateYYYY,
+			sex,
+			latestFollowUpEndDate,
+			followUpStatus);
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonFacade.java

@@ -25,6 +25,7 @@
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.caze.CaseCriteria;
+import de.symeda.sormas.api.contact.FollowUpStatus;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
 
@@ -67,6 +68,8 @@ public interface PersonFacade {
 
 	Date getLatestFollowUpEndDateByUuid(String uuid);
 
+	FollowUpStatus getMostRelevantFollowUpStatusByUuid(String uuid);
+
 	boolean setSymptomJournalStatus(String personUuid, SymptomJournalStatus status);
 
 }

sormas-api/src/main/java/de/symeda/sormas/api/statistics/StatisticsCaseAttribute.java

@@ -45,6 +45,18 @@ public enum StatisticsCaseAttribute {
 		StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR,
 		StatisticsCaseSubAttribute.DATE_RANGE),
 
+	OUTCOME_TIME(StatisticsCaseAttributeGroup.TIME,
+		false,
+		true,
+		StatisticsCaseSubAttribute.YEAR,
+		StatisticsCaseSubAttribute.QUARTER,
+		StatisticsCaseSubAttribute.MONTH,
+		StatisticsCaseSubAttribute.EPI_WEEK,
+		StatisticsCaseSubAttribute.QUARTER_OF_YEAR,
+		StatisticsCaseSubAttribute.MONTH_OF_YEAR,
+		StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR,
+		StatisticsCaseSubAttribute.DATE_RANGE),
+
 	JURISDICTION(StatisticsCaseAttributeGroup.PLACE,
 		true,
 		true,