Fixed small issues

Author: raulbob

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/doctordeclaration/AbstractDoctorDeclarationMessageProcessingFlow.java

@@ -324,7 +324,17 @@ protected boolean hasCaseHospitalizationMismatch(CaseDataDto caze, ExternalMessa
 		boolean admittedMismatch =
 			!Objects.equals(existingHospitalization.getAdmittedToHealthFacility(), externalMessage.getAdmittedToHealthFacility());
 
-		boolean mismatch = admissionDateMismatch || dischargeDateMismatch || admittedMismatch;
+		boolean hospitalizationFacilityNameMismatch =
+			!Objects.equals(
+				caze.getHealthFacility() != null ? caze.getHealthFacility().getCaption() : null,
+				externalMessage.getHospitalizationFacilityName());
+		boolean hospitalizationFacilityExternalIdMismatch =
+			!Objects.equals(
+				caze.getHealthFacility() != null ? caze.getHealthFacility().getExternalId() : null,
+				externalMessage.getHospitalizationFacilityExternalId());
+
+		boolean mismatch = admissionDateMismatch || dischargeDateMismatch || admittedMismatch
+			|| hospitalizationFacilityNameMismatch || hospitalizationFacilityExternalIdMismatch;
 
 		if (mismatch) {
 			logger.debug("[MESSAGE PROCESSING] Hospitalization mismatch detected for existing case with UUID: {}", caze.getUuid());

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/doctordeclaration/DoctorDeclarationMessageProcessingFlow.java

@@ -223,6 +223,7 @@ protected CompletionStage<Void> informCaseSymptomsMismatch(CaseDataDto caze, Ext
 		CommitDiscardWrapperComponent<VerticalLayout> commitDiscardWrapperComponent = new CommitDiscardWrapperComponent<>(content);
 		commitDiscardWrapperComponent.getCommitButton().setCaption(I18nProperties.getCaption(Captions.actionContinue));
 		commitDiscardWrapperComponent.addCommitListener(() -> ret.complete(null));
+		commitDiscardWrapperComponent.addDiscardListener(() -> ret.complete(null));
 
 		VaadinUiUtil.showModalPopupWindow(commitDiscardWrapperComponent, I18nProperties.getCaption(Captions.info), true);
 
@@ -816,6 +817,7 @@ protected CompletionStage<Void> informCaseHospitalizationMismatch(CaseDataDto ca
 		CommitDiscardWrapperComponent<VerticalLayout> commitDiscardWrapperComponent = new CommitDiscardWrapperComponent<>(content);
 		commitDiscardWrapperComponent.getCommitButton().setCaption(I18nProperties.getCaption(Captions.actionContinue));
 		commitDiscardWrapperComponent.addCommitListener(() -> ret.complete(null));
+		commitDiscardWrapperComponent.addDiscardListener(() -> ret.complete(null));
 
 		VaadinUiUtil.showModalPopupWindow(commitDiscardWrapperComponent, I18nProperties.getCaption(Captions.info), true);
 
@@ -839,6 +841,7 @@ protected CompletionStage<Void> informCaseExposuresMismatch(CaseDataDto caze, Ex
 		CommitDiscardWrapperComponent<VerticalLayout> commitDiscardWrapperComponent = new CommitDiscardWrapperComponent<>(content);
 		commitDiscardWrapperComponent.getCommitButton().setCaption(I18nProperties.getCaption(Captions.actionContinue));
 		commitDiscardWrapperComponent.addCommitListener(() -> ret.complete(null));
+		commitDiscardWrapperComponent.addDiscardListener(() -> ret.complete(null));
 
 		VaadinUiUtil.showModalPopupWindow(commitDiscardWrapperComponent, I18nProperties.getCaption(Captions.info), true);
 
@@ -862,6 +865,7 @@ protected CompletionStage<Void> informCaseActivitiesAsCaseMismatch(CaseDataDto c
 		CommitDiscardWrapperComponent<VerticalLayout> commitDiscardWrapperComponent = new CommitDiscardWrapperComponent<>(content);
 		commitDiscardWrapperComponent.getCommitButton().setCaption(I18nProperties.getCaption(Captions.actionContinue));
 		commitDiscardWrapperComponent.addCommitListener(() -> ret.complete(null));
+		commitDiscardWrapperComponent.addDiscardListener(() -> ret.complete(null));
 
 		VaadinUiUtil.showModalPopupWindow(commitDiscardWrapperComponent, I18nProperties.getCaption(Captions.info), true);