diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
index 03ecf4fb018..e826ecf80bb 100644
--- a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
+++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
@@ -24,13 +24,12 @@
   "expected_discharge",
   "references",
   "admission_encounter",
-  "admission_practitioner",
+  "primary_practitioner",
   "medical_department",
   "admission_ordered_for",
   "expected_length_of_stay",
   "admission_service_unit_type",
   "cb_admission",
-  "primary_practitioner",
   "secondary_practitioner",
   "admission_instruction",
   "encounter_details_section",
@@ -134,11 +133,11 @@
    "read_only": 1
   },
   {
+   "fetch_from": "primary_practitioner.department",
    "fieldname": "medical_department",
    "fieldtype": "Link",
    "label": "Medical Department",
-   "options": "Medical Department",
-   "set_only_once": 1
+   "options": "Medical Department"
   },
   {
    "fieldname": "primary_practitioner",
@@ -211,13 +210,6 @@
    "fieldname": "cb_admission",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "admission_practitioner",
-   "fieldtype": "Link",
-   "label": "Healthcare Practitioner",
-   "options": "Healthcare Practitioner",
-   "read_only": 1
-  },
   {
    "fieldname": "admission_encounter",
    "fieldtype": "Link",
@@ -412,7 +404,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-09 22:49:07.419692",
+ "modified": "2022-02-22 12:15:02.843426",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Inpatient Record",
diff --git a/erpnext/healthcare/doctype/vital_signs/vital_signs.json b/erpnext/healthcare/doctype/vital_signs/vital_signs.json
index a945032c7e0..6d6c351ec35 100644
--- a/erpnext/healthcare/doctype/vital_signs/vital_signs.json
+++ b/erpnext/healthcare/doctype/vital_signs/vital_signs.json
@@ -72,7 +72,6 @@
    "fieldtype": "Link",
    "in_filter": 1,
    "label": "Patient Appointment",
-   "no_copy": 1,
    "options": "Patient Appointment",
    "print_hide": 1,
    "read_only": 1
@@ -82,7 +81,6 @@
    "fieldtype": "Link",
    "in_filter": 1,
    "label": "Patient Encounter",
-   "no_copy": 1,
    "options": "Patient Encounter",
    "print_hide": 1,
    "read_only": 1
@@ -258,7 +256,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2022-01-20 12:30:07.515185",
+ "modified": "2022-02-19 11:48:16.347334",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Vital Signs",