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

Commit ac86cde

Browse files
committed
SORMAS-Foundation#2929 fix NPE on Case Hospitalization Tab
1 parent a0e9283 commit ac86cde

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/HospitalizationForm.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,8 @@ protected void addFields() {
112112

113113
TextField facilityField = addCustomField(HEALTH_FACILITY, FacilityReferenceDto.class, TextField.class);
114114
FacilityReferenceDto healthFacility = caze.getHealthFacility();
115-
final boolean noneFacility = healthFacility.getUuid().equalsIgnoreCase(FacilityDto.NONE_FACILITY_UUID);
116-
facilityField.setValue(
117-
healthFacility == null
118-
|| noneFacility
119-
|| !FacilityType.HOSPITAL.equals(caze.getFacilityType()) ? null : healthFacility.toString());
115+
final boolean noneFacility = healthFacility == null || healthFacility.getUuid().equalsIgnoreCase(FacilityDto.NONE_FACILITY_UUID);
116+
facilityField.setValue(noneFacility || !FacilityType.HOSPITAL.equals(caze.getFacilityType()) ? null : healthFacility.toString());
120117
facilityField.setReadOnly(true);
121118

122119
final OptionGroup admittedToHealthFacilityField = addField(HospitalizationDto.ADMITTED_TO_HEALTH_FACILITY, OptionGroup.class);

0 commit comments

Comments
 (0)