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

Commit e884f03

Browse files
1 parent de05d4d commit e884f03

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleFacadeEjb.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import de.symeda.sormas.api.caze.CaseReferenceDto;
2323
import de.symeda.sormas.api.contact.ContactReferenceDto;
2424
import de.symeda.sormas.api.event.EventParticipantReferenceDto;
25+
import de.symeda.sormas.api.facility.FacilityDto;
2526
import de.symeda.sormas.api.facility.FacilityHelper;
2627
import de.symeda.sormas.api.i18n.Captions;
2728
import de.symeda.sormas.api.i18n.I18nProperties;
@@ -79,6 +80,7 @@
7980
import de.symeda.sormas.backend.util.JurisdictionHelper;
8081
import de.symeda.sormas.backend.util.ModelConstants;
8182
import de.symeda.sormas.backend.util.Pseudonymizer;
83+
import org.apache.commons.lang3.StringUtils;
8284
import org.slf4j.Logger;
8385
import org.slf4j.LoggerFactory;
8486

@@ -928,8 +930,10 @@ private void onSampleChanged(SampleDto existingSample, Sample newSample) {
928930
caseFacade.onCaseChanged(CaseFacadeEjbLocal.toDto(newSample.getAssociatedCase()), newSample.getAssociatedCase());
929931
}
930932

931-
// Send an email to the lab user when a sample has been shipped to his lab
932-
if (newSample.isShipped() && (existingSample == null || !existingSample.isShipped())) {
933+
// Send an email to the lab user when a sample has been shipped to their lab
934+
if (newSample.isShipped()
935+
&& (existingSample == null || !existingSample.isShipped())
936+
&& !StringUtils.equals(newSample.getLab().getUuid(), FacilityDto.OTHER_FACILITY_UUID)) {
933937
List<User> messageRecipients = userService.getLabUsersOfLab(newSample.getLab());
934938

935939
for (User recipient : messageRecipients) {

0 commit comments

Comments
 (0)