Merge pull request SORMAS-Foundation#3038 from john1496/added-unknown-to-presentCondition#2769

added unknown category to presentCondition

Author: MateStrysewske

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

@@ -23,7 +23,8 @@ public enum PresentCondition {
 
 	ALIVE,
 	DEAD,
-	BURIED;
+	BURIED,
+	UNKNOWN;
 
 	public boolean isDeceased() {
 		return this == DEAD || this == BURIED;

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

@@ -649,6 +649,7 @@ PointOfEntryType.OTHER = Other
 PresentCondition.ALIVE=Alive
 PresentCondition.BURIED=Buried
 PresentCondition.DEAD=Dead
+PresentCondition.UNKNOWN=Unknown
 
 # QuarantineType
 QuarantineType.HOME = Home

sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java

@@ -22,7 +22,6 @@
 import de.symeda.sormas.api.caze.CaseCriteria;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.caze.CaseOutcome;
-import de.symeda.sormas.api.followup.FollowUpDto;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.location.LocationDto;
@@ -395,7 +394,7 @@ public boolean setSymptomJournalStatus(String personUuid, SymptomJournalStatus s
 	 */
 	private void cleanUp(Person person) {
 
-		if (person.getPresentCondition() == null || person.getPresentCondition() == PresentCondition.ALIVE) {
+		if (person.getPresentCondition() == null || person.getPresentCondition() == PresentCondition.ALIVE || person.getPresentCondition() == PresentCondition.UNKNOWN) {
 			person.setDeathDate(null);
 			person.setCauseOfDeath(null);
 			person.setCauseOfDeathDisease(null);