Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 3533afc

Browse files
1 parent 8070608 commit 3533afc

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import de.symeda.sormas.api.facility.FacilityType;
3838
import de.symeda.sormas.api.hospitalization.HospitalizationDto;
3939
import de.symeda.sormas.api.infrastructure.PointOfEntryReferenceDto;
40+
import de.symeda.sormas.api.person.PersonDto;
4041
import de.symeda.sormas.api.person.PersonReferenceDto;
4142
import de.symeda.sormas.api.region.CommunityReferenceDto;
4243
import de.symeda.sormas.api.region.DistrictReferenceDto;
@@ -508,10 +509,16 @@ private static void migratesAttributes(ContactDto contact, CaseDataDto cazeData)
508509
cazeData.setEpiData(contact.getEpiData());
509510
}
510511

511-
public static CaseDataDto buildFromEventParticipant(EventParticipantDto eventParticipant, Disease eventDisease) {
512+
public static CaseDataDto buildFromEventParticipant(EventParticipantDto eventParticipant, PersonDto person, Disease eventDisease) {
512513

513-
CaseDataDto cazeData = CaseDataDto.build(eventParticipant.getPerson().toReference(), eventDisease);
514-
return cazeData;
514+
CaseDataDto caseData = CaseDataDto.build(eventParticipant.getPerson().toReference(), eventDisease);
515+
516+
if (person.getPresentCondition() != null && person.getPresentCondition().isDeceased() && eventDisease == person.getCauseOfDeathDisease()) {
517+
caseData.setOutcome(CaseOutcome.DECEASED);
518+
caseData.setOutcomeDate(new Date());
519+
}
520+
521+
return caseData;
515522
}
516523

517524
public CaseReferenceDto toReference() {

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,9 @@ public CommitDiscardWrapperComponent<CaseCreateForm> getCaseCreateComponent(
374374
symptoms = null;
375375
person = convertedEventParticipant.getPerson();
376376
if (unrelatedDisease == null) {
377-
caze = CaseDataDto.buildFromEventParticipant(convertedEventParticipant, event.getDisease());
377+
caze = CaseDataDto.buildFromEventParticipant(convertedEventParticipant, person, event.getDisease());
378378
} else {
379-
caze = CaseDataDto.buildFromEventParticipant(convertedEventParticipant, unrelatedDisease);
379+
caze = CaseDataDto.buildFromEventParticipant(convertedEventParticipant, person, unrelatedDisease);
380380
}
381381
} else {
382382
symptoms = null;

0 commit comments

Comments
 (0)