#180: Resolved after merge conflicts.

ePareto-Information-System · Oct 15, 2024 · 5dda73a · 5dda73a
1 parent e83073f
commit 5dda73a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...s-app/app/src/main/java/de/symeda/sormas/app/backend/hospitalization/Hospitalization.java b/...s-app/app/src/main/java/de/symeda/sormas/app/backend/hospitalization/Hospitalization.java
@@ -263,4 +263,12 @@ public String getHealthFacilityRecordNumber() {
 	public void setHealthFacilityRecordNumber(String healthFacilityRecordNumber) {
 		this.healthFacilityRecordNumber = healthFacilityRecordNumber;
 	}
+
+	public Date getDateFormSentToDistrict() {
+		return dateFormSentToDistrict;
+	}
+
+	public void setDateFormSentToDistrict(Date dateFormSentToDistrict) {
+		this.dateFormSentToDistrict = dateFormSentToDistrict;
+	}
 }
diff --git a/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml b/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml
@@ -785,7 +785,7 @@
                 <ImageView style="@style/FullHorizontalDividerStyle" />
 
                 <TextView
-                    android:id="@+id/caseData_medicalInformationHeading"
+                    android:id="@+id/caseData_headingAdditionalMedicalInformation"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/heading_additional_medical_information"