Merge pull request #12927 from SORMAS-Foundation/#12917-Do_not_update…

…_facility_if_place_of_stay_is_home #12917 - Do not update facility when Place of stay is HOME
SORMAS-Foundation · Feb 1, 2024 · 92219b2 · 92219b2
2 parents 9de076c + c4fa78e
commit 92219b2
Showing 1 changed file with 28 additions and 22 deletions.
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java
@@ -327,36 +327,42 @@ protected void addFields() {
 			updateFacilityFields(facility, healthFacilityDetails);
 		});
 		district.addValueChangeListener(e -> {
-			FieldHelper.removeItems(facility);
-			FieldHelper.removeItems(community);
 			DistrictReferenceDto districtDto = (DistrictReferenceDto) e.getProperty().getValue();
+			FieldHelper.removeItems(community);
 			FieldHelper.updateItems(
 				community,
 				districtDto != null ? FacadeProvider.getCommunityFacade().getAllActiveByDistrict(districtDto.getUuid()) : null);
-			if (districtDto != null && facilityType.getValue() != null) {
-				FieldHelper.updateItems(
-					facility,
-					FacadeProvider.getFacilityFacade()
-						.getActiveFacilitiesByDistrictAndType(districtDto, (FacilityType) facilityType.getValue(), true, false));
+
+			if (!TypeOfPlace.HOME.equals(facilityOrHome.getValue())) {
+				FieldHelper.removeItems(facility);
+				if (districtDto != null && facilityType.getValue() != null) {
+					FieldHelper.updateItems(
+						facility,
+						FacadeProvider.getFacilityFacade()
+							.getActiveFacilitiesByDistrictAndType(districtDto, (FacilityType) facilityType.getValue(), true, false));
+				}
 			}
 		});
 		community.addValueChangeListener(e -> {
-			FieldHelper.removeItems(facility);
-			CommunityReferenceDto communityDto = (CommunityReferenceDto) e.getProperty().getValue();
-			if (facilityType.getValue() != null) {
-				FieldHelper.updateItems(
-					facility,
-					communityDto != null
-						? FacadeProvider.getFacilityFacade()
-							.getActiveFacilitiesByCommunityAndType(communityDto, (FacilityType) facilityType.getValue(), true, false)
-						: district.getValue() != null
+			if (!TypeOfPlace.HOME.equals(facilityOrHome.getValue())) {
+				FieldHelper.removeItems(facility);
+
+				CommunityReferenceDto communityDto = (CommunityReferenceDto) e.getProperty().getValue();
+				if (facilityType.getValue() != null) {
+					FieldHelper.updateItems(
+						facility,
+						communityDto != null
 							? FacadeProvider.getFacilityFacade()
-								.getActiveFacilitiesByDistrictAndType(
-									(DistrictReferenceDto) district.getValue(),
-									(FacilityType) facilityType.getValue(),
-									true,
-									false)
-							: null);
+								.getActiveFacilitiesByCommunityAndType(communityDto, (FacilityType) facilityType.getValue(), true, false)
+							: district.getValue() != null
+								? FacadeProvider.getFacilityFacade()
+									.getActiveFacilitiesByDistrictAndType(
+										(DistrictReferenceDto) district.getValue(),
+										(FacilityType) facilityType.getValue(),
+										true,
+										false)
+								: null);
+				}
 			}
 		});
 		facilityTypeGroup.addValueChangeListener(e -> {