diff --git a/hms_tz/hms_tz/doctype/nurse_record/nurse_record.js b/hms_tz/hms_tz/doctype/nurse_record/nurse_record.js
index 3827aa93..1f613162 100644
--- a/hms_tz/hms_tz/doctype/nurse_record/nurse_record.js
+++ b/hms_tz/hms_tz/doctype/nurse_record/nurse_record.js
@@ -663,7 +663,7 @@ function show_schedule_medication_dialog(
     );
 
     let doses_per_day = Math.floor(24 / vals.interval_hours);
-    let total_days = Math.ceil(total_doses / doses_per_day);
+    let total_days = Math.floor(total_doses / doses_per_day);
 
     let preview_html =
       '<div style="padding: 10px; background: #e8f5e9; border-radius: 4px;">' +
diff --git a/hms_tz/hms_tz/doctype/nurse_record/nurse_record.json b/hms_tz/hms_tz/doctype/nurse_record/nurse_record.json
index 48e4b2b7..acf78366 100644
--- a/hms_tz/hms_tz/doctype/nurse_record/nurse_record.json
+++ b/hms_tz/hms_tz/doctype/nurse_record/nurse_record.json
@@ -19,8 +19,8 @@
   "status",
   "posting_time",
   "section_break_hsu",
-  "service_unit",
-  "service_unit_type",
+  "room",
+  "ward",
   "naming_series",
   "column_break_references",
   "nurse",
@@ -184,18 +184,6 @@
    "label": "Shift End Time",
    "read_only": 1
   },
-  {
-   "fieldname": "service_unit",
-   "fieldtype": "Link",
-   "label": "Service Unit",
-   "options": "Healthcare Service Unit"
-  },
-  {
-   "fieldname": "service_unit_type",
-   "fieldtype": "Link",
-   "label": "Service Unit Type",
-   "options": "Healthcare Service Unit Type"
-  },
   {
    "fieldname": "column_break_references",
    "fieldtype": "Column Break"
@@ -471,11 +459,23 @@
    "options": "Shift Type",
    "reqd": 1,
    "search_index": 1
+  },
+  {
+   "fieldname": "room",
+   "fieldtype": "Link",
+   "label": "Room",
+   "options": "Healthcare Service Unit"
+  },
+  {
+   "fieldname": "ward",
+   "fieldtype": "Link",
+   "label": "Ward",
+   "options": "Healthcare Service Unit Type"
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2026-05-15 01:35:40.359315",
+ "modified": "2026-05-15 03:10:57.599706",
  "modified_by": "Administrator",
  "module": "Hms Tz",
  "name": "Nurse Record",