diff --git a/src/main/java/com/divudi/bean/common/NotificationController.java b/src/main/java/com/divudi/bean/common/NotificationController.java
index 69cbe025cd..d15871e201 100644
--- a/src/main/java/com/divudi/bean/common/NotificationController.java
+++ b/src/main/java/com/divudi/bean/common/NotificationController.java
@@ -127,6 +127,15 @@ public void createNotification(PatientRoom pr, String action) {
             case "Discharge":
                 createInwardRoomDischargeNotifications(pr);
                 break;
+            case "Admit":
+                createInwardRoomAdmitNotifications(pr);
+                break;
+            case "Change":
+                createInwardRoomChangeNotifications(pr);
+                break;
+            case "CancelDischarge":
+                createInwardRoomDischargeCancelNotifications(pr);
+                break;
 
             default:
                 throw new AssertionError();
@@ -165,6 +174,62 @@ private void createInwardRoomDischargeNotifications(PatientRoom pr) {
         }
     }
 
+    private void createInwardRoomAdmitNotifications(PatientRoom pr) {
+        Date date = new Date();
+        for (TriggerType tt : TriggerType.getTriggersByParent(TriggerTypeParent.INWARD_PATIENT_ROOM_ADDED)) {
+            Notification nn = new Notification();
+            nn.setCreatedAt(date);
+            nn.setPatientRoom(pr);
+            nn.setTriggerType(tt);
+            nn.setCreater(sessionController.getLoggedUser());
+            String roomName = pr.getRoomFacilityCharge() != null ? pr.getRoomFacilityCharge().getName() : "Unknown Room";
+            String patientName = "";
+            if (pr.getPatientEncounter() != null && pr.getPatientEncounter().getPatient() != null
+                    && pr.getPatientEncounter().getPatient().getPerson() != null) {
+                patientName = pr.getPatientEncounter().getPatient().getPerson().getNameWithTitle();
+            }
+            String msg = "Patient " + patientName + " admitted to " + roomName;
+            nn.setMessage(msg);
+            getFacade().create(nn);
+            userNotificationController.createUserNotifications(nn);
+        }
+    }
+
+    private void createInwardRoomChangeNotifications(PatientRoom pr) {
+        Date date = new Date();
+        for (TriggerType tt : TriggerType.getTriggersByParent(TriggerTypeParent.INWARD_PATIENT_ROOM_CHANGED)) {
+            Notification nn = new Notification();
+            nn.setCreatedAt(date);
+            nn.setPatientRoom(pr);
+            nn.setTriggerType(tt);
+            nn.setCreater(sessionController.getLoggedUser());
+            String roomName = pr.getRoomFacilityCharge() != null ? pr.getRoomFacilityCharge().getName() : "Unknown Room";
+            String msg = "Patient moved to " + roomName;
+            if (pr.getPatientEncounter() != null && pr.getPatientEncounter().getBhtNo() != null) {
+                msg = msg + " (BHT: " + pr.getPatientEncounter().getBhtNo() + ")";
+            }
+            nn.setMessage(msg);
+            getFacade().create(nn);
+            userNotificationController.createUserNotifications(nn);
+        }
+    }
+
+    private void createInwardRoomDischargeCancelNotifications(PatientRoom pr) {
+        Date date = new Date();
+        for (TriggerType tt : TriggerType.getTriggersByParent(TriggerTypeParent.INWARD_PATIENT_ROOM_DISCHARGED)) {
+            Notification nn = new Notification();
+            nn.setCreatedAt(date);
+            nn.setPatientRoom(pr);
+            nn.setTriggerType(tt);
+            nn.setCreater(sessionController.getLoggedUser());
+            String roomName = pr.getRoomFacilityCharge() != null ? pr.getRoomFacilityCharge().getName() : "Unknown Room";
+            String msg = "Room Discharge Cancelled for " + roomName;
+            nn.setMessage(msg);
+            getFacade().create(nn);
+            userNotificationController.createUserNotifications(nn);
+        }
+    }
+
     private void createInwardClinicalDischargeNotifications(PatientEncounter pe) {
         Date date = new Date();
         for (TriggerType tt : TriggerType.getTriggersByParent(TriggerTypeParent.INWARD_PATIENT_CLINICAL_DISCHARGED)) {
diff --git a/src/main/java/com/divudi/bean/inward/AdmissionController.java b/src/main/java/com/divudi/bean/inward/AdmissionController.java
index cdc82d5498..8a3659af7a 100644
--- a/src/main/java/com/divudi/bean/inward/AdmissionController.java
+++ b/src/main/java/com/divudi/bean/inward/AdmissionController.java
@@ -762,6 +762,34 @@ public String navigateToPatientRoomDetails() {
         return bhtSummeryController.navigateToPatientRoomDetails();
     }
 
+    /**
+     * Returns the list of currently active (non-discharged, non-retired)
+     * PatientRoom and GuardianRoom records for the current admission.
+     * Used by the dashboard "Room Management" panel to display current room
+     * assignments.
+     */
+    public List<com.divudi.core.entity.inward.PatientRoom> getActivePatientRooms() {
+        if (current == null) {
+            return java.util.Collections.emptyList();
+        }
+        List<com.divudi.core.entity.inward.PatientRoom> activeRooms = new java.util.ArrayList<>();
+        try {
+            String jpql = "SELECT pr FROM PatientRoom pr "
+                    + "WHERE pr.retired = false "
+                    + "AND pr.discharged = false "
+                    + "AND pr.patientEncounter = :enc "
+                    + "ORDER BY pr.createdAt";
+            java.util.HashMap<String, Object> params = new java.util.HashMap<>();
+            params.put("enc", current);
+            activeRooms = patientRoomFacade.findByJpql(jpql, params);
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Failed to load active rooms for admission ID: "
+                    + (current != null ? current.getId() : null), e);
+            JsfUtil.addErrorMessage("Unable to load current room assignments.");
+        }
+        return activeRooms;
+    }
+
     public String navigateToAddBabyAdmission() {
         parentAdmission = current;
         Admission ad = new Admission();
diff --git a/src/main/java/com/divudi/bean/inward/RoomChangeController.java b/src/main/java/com/divudi/bean/inward/RoomChangeController.java
index f060e9d6a4..5b206c5ea5 100644
--- a/src/main/java/com/divudi/bean/inward/RoomChangeController.java
+++ b/src/main/java/com/divudi/bean/inward/RoomChangeController.java
@@ -66,6 +66,8 @@ public class RoomChangeController implements Serializable {
     NotificationController notificationController;
     @Inject
     private InwardBeanController inwardBean;
+    @Inject
+    private com.divudi.bean.common.AuditEventApplicationController auditEventApplicationController;
 
     @EJB
     private AdmissionFacade ejbFacade;
@@ -84,6 +86,7 @@ public class RoomChangeController implements Serializable {
 
     private List<PatientRoom> patientRoom;
     private PatientRoom currentPatientRoom;
+    private PatientRoom roomForReceipt;
     List<Admission> selectedItems;
     private Admission current;
     private List<Admission> items = null;
@@ -242,6 +245,9 @@ public void admitRoom() {
         current.setRoomAdmitted(true);
         ejbFacade.edit(current);
 
+        recordRoomAuditEvent(getCurrentPatientRoom(), "Room Admitted", null);
+        notificationController.createNotification(getCurrentPatientRoom(), "Admit");
+
         JsfUtil.addSuccessMessage("Room admitted successfully");
 
     }
@@ -281,6 +287,10 @@ public void remove(PatientRoom pR) {
             return;
         }
 
+        String beforeState = "roomFacilityCharge=" + (pR.getRoomFacilityCharge() != null ? pR.getRoomFacilityCharge().getName() : "null")
+                + ", admittedAt=" + pR.getAdmittedAt()
+                + ", discharged=" + pR.isDischarged();
+
         pR.setRetirer(getSessionController().getLoggedUser());
         pR.setRetired(true);
         pR.setRetiredAt(new Date());
@@ -294,6 +304,8 @@ public void remove(PatientRoom pR) {
             getCurrent().setCurrentPatientRoom(pR.getPreviousRoom());
             getEjbFacade().edit(getCurrent());
         }
+
+        recordRoomAuditEvent(pR, "Room Removed", beforeState);
     }
 
     public void discharge(PatientRoom pR) {
@@ -314,6 +326,8 @@ public void discharge(PatientRoom pR) {
             encounter.setRoomDischargedBy(getSessionController().getLoggedUser());
             patientEncounterFacade.edit(encounter);
         }
+
+        recordRoomAuditEvent(pR, "Room Discharged", null);
     }
 
     public void dischargeWithCurrentTime(PatientRoom pR) {
@@ -323,7 +337,7 @@ public void dischargeWithCurrentTime(PatientRoom pR) {
         List<PatientRoom> rooms = bhtSummeryController.getPatientRooms();
         if (rooms != null) {
             if (rooms.size() > 1) {
-                int currentRoomIndex = rooms.indexOf(patientRoom);
+                int currentRoomIndex = rooms.indexOf(pR);
                 if (currentRoomIndex > 0) {
                     PatientRoom previousRoom = rooms.get(currentRoomIndex - 1);
 
@@ -349,12 +363,83 @@ public void dischargeWithCurrentTime(PatientRoom pR) {
             encounter.setRoomDischargedBy(getSessionController().getLoggedUser());
             patientEncounterFacade.edit(encounter);
         }
+
+        // Record audit event
+        recordRoomAuditEvent(pR, "Room Discharged", null);
+
+        JsfUtil.addSuccessMessage("Successfully Discharged from Room");
     }
 
     public void dischargeCancel(PatientRoom pR) {
+        if (pR == null) {
+            return;
+        }
+        // Capture state before cancel for audit
+        String beforeState = "discharged=true, dischargedAt=" + pR.getDischargedAt()
+                + ", dischargedBy=" + (pR.getDischargedBy() != null ? pR.getDischargedBy().getName() : "null");
+
         pR.setDischarged(false);
         pR.setDischargedBy(null);
+        pR.setDischargedAt(null);
         getPatientRoomFacade().edit(pR);
+
+        // Record audit event
+        recordRoomAuditEvent(pR, "Room Discharge Cancelled", beforeState);
+        notificationController.createNotification(pR, "CancelDischarge");
+
+        JsfUtil.addSuccessMessage("Room Discharge Cancelled");
+    }
+
+    private void recordRoomAuditEvent(PatientRoom pr, String trigger, String beforeState) {
+        try {
+            com.divudi.core.entity.AuditEvent auditEvent = new com.divudi.core.entity.AuditEvent();
+            auditEvent.setEventDataTime(new Date());
+            auditEvent.setEventTrigger(trigger);
+            auditEvent.setEntityType(pr.getClass().getSimpleName());
+            auditEvent.setObjectId(pr.getId());
+            if (pr.getPatientEncounter() != null) {
+                auditEvent.setUrl("BHT: " + pr.getPatientEncounter().getBhtNo()
+                        + " | Room: " + (pr.getRoomFacilityCharge() != null ? pr.getRoomFacilityCharge().getName() : "N/A"));
+            }
+            if (sessionController.getLoggedUser() != null) {
+                auditEvent.setWebUserId(sessionController.getLoggedUser().getId());
+            }
+            if (sessionController.getInstitution() != null) {
+                auditEvent.setInstitutionId(sessionController.getInstitution().getId());
+            }
+            if (sessionController.getDepartment() != null) {
+                auditEvent.setDepartmentId(sessionController.getDepartment().getId());
+            }
+            if (beforeState != null) {
+                auditEvent.setBeforeJson(beforeState);
+            }
+            String afterState = "discharged=" + pr.isDischarged()
+                    + ", dischargedAt=" + pr.getDischargedAt()
+                    + ", dischargedBy=" + (pr.getDischargedBy() != null ? pr.getDischargedBy().getName() : "null");
+            auditEvent.setAfterJson(afterState);
+            auditEvent.setEventStatus("Completed");
+            auditEvent.setEventDuration(new Date().getTime() - auditEvent.getEventDataTime().getTime());
+            auditEventApplicationController.logAuditEvent(auditEvent);
+        } catch (Exception e) {
+            // Silently fail â€" audit failure should not block the user action
+        }
+    }
+
+    public String navigateToRoomDischargeReceipt(PatientRoom pr) {
+        if (pr == null) {
+            JsfUtil.addErrorMessage("No room selected");
+            return "";
+        }
+        this.roomForReceipt = pr;
+        return "/inward/inward_room_discharge_receipt?faces-redirect=true";
+    }
+
+    public PatientRoom getRoomForReceipt() {
+        return roomForReceipt;
+    }
+
+    public void setRoomForReceipt(PatientRoom roomForReceipt) {
+        this.roomForReceipt = roomForReceipt;
     }
 
     public void removeRoom(PatientRoom pR) {
@@ -362,11 +447,13 @@ public void removeRoom(PatientRoom pR) {
             JsfUtil.addErrorMessage("No Patient Room Detected");
             return;
         }
+        String beforeState = "room=" + (pR.getRoomFacilityCharge() != null ? pR.getRoomFacilityCharge().getName() : "null");
         pR.setRetired(true);
         pR.setRetiredAt(new Date());
         pR.setRetirer(sessionController.getWebUser());
         getPatientRoomFacade().edit(pR);
         bhtSummeryController.setPatientRooms(null);
+        recordRoomAuditEvent(pR, "Room Removed", beforeState);
     }
 
     public void removeGuardianRoom(PatientRoom pR) {
@@ -376,6 +463,7 @@ public void removeGuardianRoom(PatientRoom pR) {
             return;
         }
 
+        String beforeState = "room=" + (pR.getRoomFacilityCharge() != null ? pR.getRoomFacilityCharge().getName() : "null");
         pR.setRetirer(getSessionController().getLoggedUser());
         pR.setRetired(true);
         pR.setRetiredAt(new Date());
@@ -388,6 +476,7 @@ public void removeGuardianRoom(PatientRoom pR) {
             getPatientRoomFacade().edit(pR.getPreviousRoom());
         }
 
+        recordRoomAuditEvent(pR, "Guardian Room Removed", beforeState);
     }
 
     public void recreate() {
@@ -456,6 +545,9 @@ public void change() {
         // Save consultant information
         saveConsultantInfo(newPatientRoom);
 
+        recordRoomAuditEvent(newPatientRoom, "Room Changed", "previousRoom=" + (oldPatientRoom.getRoomFacilityCharge() != null ? oldPatientRoom.getRoomFacilityCharge().getName() : "null"));
+        notificationController.createNotification(newPatientRoom, "Change");
+
         if (newConsultant != null || newPrimeConsultant != null) {
             JsfUtil.addSuccessMessage("Room changed with consultant details");
         } else {
@@ -489,7 +581,10 @@ public void addNewRoom() {
         // Save consultant information
         saveConsultantInfo(newPatientRoom);
 
-        JsfUtil.addSuccessMessage("Successfully Room Changed");
+        recordRoomAuditEvent(newPatientRoom, "Room Added", null);
+        notificationController.createNotification(newPatientRoom, "Admit");
+
+        JsfUtil.addSuccessMessage("Successfully Room Added");
 
         newRoomFacilityCharge = null;
         changeAt = null;
@@ -535,7 +630,10 @@ public void changeGurdianRoom() {
             getPatientRoomFacade().edit(oldGaurdianRoom);
         }
 
-        JsfUtil.addSuccessMessage("Successfully Room Changed");
+        recordRoomAuditEvent(newGuardianRoom, "Guardian Room Changed", oldGaurdianRoom != null ? "previousRoom=" + (oldGaurdianRoom.getRoomFacilityCharge() != null ? oldGaurdianRoom.getRoomFacilityCharge().getName() : "null") : "first guardian room");
+        notificationController.createNotification(newGuardianRoom, "Change");
+
+        JsfUtil.addSuccessMessage("Successfully Guardian Room Changed");
         newRoomFacilityCharge = null;
         changeAt = null;
         createGuardianRoom();
diff --git a/src/main/java/com/divudi/core/data/TriggerType.java b/src/main/java/com/divudi/core/data/TriggerType.java
index 3a215f5a35..ce3abacc7c 100644
--- a/src/main/java/com/divudi/core/data/TriggerType.java
+++ b/src/main/java/com/divudi/core/data/TriggerType.java
@@ -63,7 +63,15 @@ public enum TriggerType {
     // Inward discharge — stage 2: room/bed discharge (bed released; typically notifies billing).
     INWARD_PATIENT_ROOM_DISCHARGED("Inward Patient Room Discharge - System Notification", NotificationMedium.SYSTEM_NOTIFICATION, TriggerTypeParent.INWARD_PATIENT_ROOM_DISCHARGED),
     INWARD_PATIENT_ROOM_DISCHARGED_SMS("Inward Patient Room Discharge - SMS", NotificationMedium.SMS, TriggerTypeParent.INWARD_PATIENT_ROOM_DISCHARGED),
-    INWARD_PATIENT_ROOM_DISCHARGED_EMAIL("Inward Patient Room Discharge - Email", NotificationMedium.EMAIL, TriggerTypeParent.INWARD_PATIENT_ROOM_DISCHARGED);
+    INWARD_PATIENT_ROOM_DISCHARGED_EMAIL("Inward Patient Room Discharge - Email", NotificationMedium.EMAIL, TriggerTypeParent.INWARD_PATIENT_ROOM_DISCHARGED),
+    // Inward room — patient admitted/added to a room
+    INWARD_PATIENT_ROOM_ADDED("Inward Patient Room Added - System Notification", NotificationMedium.SYSTEM_NOTIFICATION, TriggerTypeParent.INWARD_PATIENT_ROOM_ADDED),
+    INWARD_PATIENT_ROOM_ADDED_SMS("Inward Patient Room Added - SMS", NotificationMedium.SMS, TriggerTypeParent.INWARD_PATIENT_ROOM_ADDED),
+    INWARD_PATIENT_ROOM_ADDED_EMAIL("Inward Patient Room Added - Email", NotificationMedium.EMAIL, TriggerTypeParent.INWARD_PATIENT_ROOM_ADDED),
+    // Inward room — patient changed/moved to a different room
+    INWARD_PATIENT_ROOM_CHANGED("Inward Patient Room Changed - System Notification", NotificationMedium.SYSTEM_NOTIFICATION, TriggerTypeParent.INWARD_PATIENT_ROOM_CHANGED),
+    INWARD_PATIENT_ROOM_CHANGED_SMS("Inward Patient Room Changed - SMS", NotificationMedium.SMS, TriggerTypeParent.INWARD_PATIENT_ROOM_CHANGED),
+    INWARD_PATIENT_ROOM_CHANGED_EMAIL("Inward Patient Room Changed - Email", NotificationMedium.EMAIL, TriggerTypeParent.INWARD_PATIENT_ROOM_CHANGED);
 
     private final String label;
     private final NotificationMedium medium;
diff --git a/src/main/java/com/divudi/core/data/TriggerTypeParent.java b/src/main/java/com/divudi/core/data/TriggerTypeParent.java
index 085c0c6fcd..101af72cc4 100644
--- a/src/main/java/com/divudi/core/data/TriggerTypeParent.java
+++ b/src/main/java/com/divudi/core/data/TriggerTypeParent.java
@@ -13,6 +13,8 @@ public enum TriggerTypeParent {
     OPD_BILL_CANCELLATION,
     INWARD_PATIENT_CLINICAL_DISCHARGED,
     INWARD_PATIENT_ROOM_DISCHARGED,
+    INWARD_PATIENT_ROOM_ADDED,
+    INWARD_PATIENT_ROOM_CHANGED,
     INWARD_PATIENT_DISCHARGED,
     FLOAT_TRANSFER_REQUEST
 }
diff --git a/src/main/webapp/inward/admission_profile.xhtml b/src/main/webapp/inward/admission_profile.xhtml
index b2aaf13996..06e7a19e5d 100644
--- a/src/main/webapp/inward/admission_profile.xhtml
+++ b/src/main/webapp/inward/admission_profile.xhtml
@@ -512,8 +512,79 @@
 
                         <p:panel header="Room Management" class="m-1">
                             <div class="row g-2">
+                                <!-- Current Room Assignments -->
+                                <div class="col-12">
+                                    <h:panelGroup rendered="#{empty admissionController.activePatientRooms}" layout="block">
+                                        <div class="text-center py-2 text-muted small">
+                                            <i class="fa-solid fa-info-circle me-1"/>
+                                            Not admitted to any room
+                                        </div>
+                                    </h:panelGroup>
+                                    <ui:repeat value="#{admissionController.activePatientRooms}" var="room">
+                                        <div class="d-flex align-items-center justify-content-between p-2 mb-1 border rounded" style="background: #f0f8ff;">
+                                            <div>
+                                                <div class="fw-semibold small">
+                                                    <i class="fa-solid fa-bed text-primary me-1"/>
+                                                    <h:outputText value="#{room.roomFacilityCharge.name}"/>
+                                                    <h:panelGroup rendered="#{room.patientRoomClass eq 'class com.divudi.core.entity.inward.GuardianRoom'}">
+                                                        <span class="badge bg-success ms-1" style="font-size:0.65rem;">Guardian</span>
+                                                    </h:panelGroup>
+                                                </div>
+                                                <div class="text-muted" style="font-size:0.72rem;">
+                                                    <i class="fa-solid fa-clock me-1"/>
+                                                    Admitted:
+                                                    <h:outputText value="#{room.admittedAt}">
+                                                        <f:convertDateTime pattern="dd MMM yyyy HH:mm" timeZone="Asia/Colombo"/>
+                                                    </h:outputText>
+                                                </div>
+                                            </div>
+                                            <p:commandButton
+                                                value="View"
+                                                ajax="false"
+                                                icon="fa-solid fa-arrow-right"
+                                                class="ui-button-sm ui-button-info"
+                                                action="#{admissionController.navigateToPatientRoomDetails()}">
+                                            </p:commandButton>
+                                        </div>
+                                    </ui:repeat>
+                                </div>
+
+                                <!-- Add New Room Buttons -->
+                                <div class="col-6">
+                                    <p:commandButton
+                                        id="btnAddNewRoom"
+                                        rendered="#{webUserController.hasPrivilege('InwardRoomRoomChange')}"
+                                        disabled="#{admissionController.current.discharged eq true}"
+                                        value="Add New Room"
+                                        ajax="false"
+                                        action="#{admissionController.navigateToRoomChange}"
+                                        icon="fa fa-plus-circle"
+                                        class="w-100 ui-button-success">
+                                        <f:setPropertyActionListener
+                                            value="#{admissionController.current}"
+                                            target="#{roomChangeController.current}" />
+                                    </p:commandButton>
+                                </div>
+                                <div class="col-6">
+                                    <p:commandButton
+                                        id="btnAddGuardianRoom"
+                                        rendered="#{webUserController.hasPrivilege('InwardRoomGurdianRoomChange')}"
+                                        value="Add Guardian Room"
+                                        ajax="false"
+                                        disabled="#{admissionController.current.discharged eq true}"
+                                        action="#{admissionController.navigateToGuardianRoomChange}"
+                                        icon="fa fa-user-plus"
+                                        class="w-100 ui-button-success">
+                                        <f:setPropertyActionListener
+                                            value="#{admissionController.current}"
+                                            target="#{roomChangeController.current}" />
+                                    </p:commandButton>
+                                </div>
+
                                 <div class="col-12">
                                     <p:commandButton
+                                        id="btnRoomDetails"
+                                        rendered="#{webUserController.hasPrivilege('InwardRoomRoomOccupency')}"
                                         value="Room Details"
                                         ajax="false"
                                         action="#{admissionController.navigateToPatientRoomDetails()}"
@@ -523,6 +594,8 @@
                                 </div>
                                 <div class="col-6">
                                     <p:commandButton
+                                        id="btnRoomChange"
+                                        rendered="#{webUserController.hasPrivilege('InwardRoomRoomChange')}"
                                         disabled="#{admissionController.current.discharged eq true}"
                                         value="Room Change"
                                         ajax="false"
@@ -536,6 +609,8 @@
                                 </div>
                                 <div class="col-6">
                                     <p:commandButton
+                                        id="btnGuardianRoomChange"
+                                        rendered="#{webUserController.hasPrivilege('InwardRoomGurdianRoomChange')}"
                                         value="Guardian Room Change"
                                         ajax="false"
                                         disabled="#{admissionController.current.discharged eq true}"
diff --git a/src/main/webapp/inward/inward_patient_room_details.xhtml b/src/main/webapp/inward/inward_patient_room_details.xhtml
index 5610aa3a7c..015efc4241 100644
--- a/src/main/webapp/inward/inward_patient_room_details.xhtml
+++ b/src/main/webapp/inward/inward_patient_room_details.xhtml
@@ -207,16 +207,16 @@
                                         <p:column headerText="Actions" style="width:240px;">
                                             <div class="d-flex gap-1 flex-wrap">
                                                 <p:commandButton
-                                                    ajax="false"
+                                                    update="@form"
                                                     icon="fa fa-save"
                                                     title="Save Changes"
                                                     class="ui-button-info"
                                                     disabled="#{bhtSummeryController.patientEncounter.discharged}"
                                                     action="#{bhtSummeryController.updatePatientRoom(rm)}">
                                                 </p:commandButton>
-                                                
+
                                                 <p:commandButton
-                                                    ajax="false"
+                                                    update="@form"
                                                     icon="fa fa-calculator"
                                                     title="Update Charges from Room Rates"
                                                     disabled="#{bhtSummeryController.patientEncounter.discharged}"
@@ -225,25 +225,45 @@
                                                 </p:commandButton>
                                                 
                                                 <p:commandButton
-                                                    ajax="false"
+                                                    process="@this"
+                                                    update="@form"
                                                     icon="fa fa-check-square"
                                                     title="Discharge from Room"
+                                                    rendered="#{not rm.discharged}"
                                                     disabled="#{bhtSummeryController.patientEncounter.discharged}"
                                                     class="ui-button-warning"
                                                     action="#{roomChangeController.dischargeWithCurrentTime(rm)}">
+                                                    <p:confirm header="Confirm Discharge"
+                                                               message="Are you sure you want to discharge from this room?"
+                                                               icon="fa fa-exclamation-triangle"/>
                                                 </p:commandButton>
-                                                
+
                                                 <p:commandButton
-                                                    ajax="false"
+                                                    process="@this"
+                                                    update="@form"
                                                     icon="fa fa-times-circle"
                                                     title="Cancel Room Discharge"
+                                                    rendered="#{rm.discharged}"
                                                     disabled="#{bhtSummeryController.patientEncounter.discharged}"
                                                     class="ui-button-danger"
                                                     action="#{roomChangeController.dischargeCancel(rm)}">
+                                                    <p:confirm header="Confirm Cancel Discharge"
+                                                               message="Are you sure you want to cancel this room discharge?"
+                                                               icon="fa fa-exclamation-triangle"/>
                                                 </p:commandButton>
-                                                
+
                                                 <p:commandButton
                                                     ajax="false"
+                                                    icon="fa fa-print"
+                                                    title="Print Discharge Receipt"
+                                                    rendered="#{rm.discharged}"
+                                                    class="ui-button-info"
+                                                    action="#{roomChangeController.navigateToRoomDischargeReceipt(rm)}">
+                                                </p:commandButton>
+
+                                                <p:commandButton
+                                                    process="@this"
+                                                    update="@form"
                                                     icon="fa fa-trash"
                                                     title="Remove Room"
                                                     disabled="#{bhtSummeryController.patientEncounter.discharged}"
diff --git a/src/main/webapp/inward/inward_room_discharge_receipt.xhtml b/src/main/webapp/inward/inward_room_discharge_receipt.xhtml
new file mode 100644
index 0000000000..11b5364b99
--- /dev/null
+++ b/src/main/webapp/inward/inward_room_discharge_receipt.xhtml
@@ -0,0 +1,194 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common">
+
+    <h:body>
+        <ui:composition template="/resources/template/template.xhtml">
+            <ui:define name="content">
+                <h:form id="receiptForm">
+
+                    <h:panelGroup rendered="#{roomChangeController.roomForReceipt eq null}" layout="block">
+                        <div class="text-center py-5">
+                            <i class="fa-solid fa-exclamation-circle fa-3x text-warning mb-3"></i>
+                            <p class="text-muted">No room discharge record selected. Please navigate from the Patient Room Details page.</p>
+                            <p:commandButton
+                                value="Inpatient Dashboard"
+                                ajax="false"
+                                action="/inward/admission_profile?faces-redirect=true"
+                                icon="fa fa-id-card"
+                                class="ui-button-secondary mt-3">
+                            </p:commandButton>
+                        </div>
+                    </h:panelGroup>
+
+                    <h:panelGroup rendered="#{roomChangeController.roomForReceipt ne null}" layout="block">
+
+                        <!-- Action Buttons (hidden when printing) -->
+                        <div class="d-flex justify-content-between align-items-center mb-3 no-print">
+                            <div class="d-flex gap-2">
+                                <p:commandButton
+                                    type="button"
+                                    value="Print"
+                                    icon="fa fa-print"
+                                    class="ui-button-info"
+                                    onclick="window.print();">
+                                </p:commandButton>
+                                <p:commandButton
+                                    type="button"
+                                    value="Print Copy"
+                                    icon="fa fa-copy"
+                                    class="ui-button-secondary"
+                                    onclick="window.print();">
+                                </p:commandButton>
+                            </div>
+                            <p:commandButton
+                                value="Inpatient Dashboard"
+                                ajax="false"
+                                icon="fa fa-id-card"
+                                class="ui-button-success"
+                                action="#{admissionController.navigateToAdmissionProfilePage()}">
+                                <f:setPropertyActionListener
+                                    value="#{roomChangeController.roomForReceipt.patientEncounter}"
+                                    target="#{admissionController.current}"/>
+                            </p:commandButton>
+                        </div>
+
+                        <!-- Receipt Content -->
+                        <div class="border p-4" style="max-width:800px; margin:0 auto; background:#fff;">
+                            <!-- Hospital Header -->
+                            <div class="text-center mb-4">
+                                <h4 class="mb-0 fw-bold">
+                                    <h:outputText value="#{sessionController.institution.name}" />
+                                </h4>
+                                <p class="text-muted mb-1">Room Discharge Receipt</p>
+                                <hr/>
+                            </div>
+
+                            <!-- Patient Details -->
+                            <table class="w-100 mb-3" style="font-size:0.9rem;">
+                                <tr>
+                                    <td style="width:25%;" class="fw-bold">Patient Name</td>
+                                    <td style="width:25%;">
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.patientEncounter.patient.person.nameWithTitle}"/>
+                                    </td>
+                                    <td style="width:25%;" class="fw-bold">BHT No</td>
+                                    <td style="width:25%;">
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.patientEncounter.bhtNo}"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="fw-bold">Age</td>
+                                    <td>
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.patientEncounter.patient.person.ageAsString}"/>
+                                    </td>
+                                    <td class="fw-bold">Admission Date</td>
+                                    <td>
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.patientEncounter.dateOfAdmission}">
+                                            <f:convertDateTime pattern="dd MMM yyyy HH:mm" timeZone="Asia/Colombo"/>
+                                        </h:outputText>
+                                    </td>
+                                </tr>
+                            </table>
+
+                            <hr/>
+
+                            <!-- Room Discharge Details -->
+                            <table class="w-100 mb-3" style="font-size:0.9rem;">
+                                <tr>
+                                    <td style="width:25%;" class="fw-bold">Room</td>
+                                    <td style="width:25%;">
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.roomFacilityCharge.name}"/>
+                                        <h:panelGroup rendered="#{roomChangeController.roomForReceipt.patientRoomClass eq 'class com.divudi.core.entity.inward.GuardianRoom'}">
+                                            <span class="badge bg-success ms-1">Guardian</span>
+                                        </h:panelGroup>
+                                    </td>
+                                    <td style="width:25%;" class="fw-bold">Status</td>
+                                    <td style="width:25%;">
+                                        <span class="badge bg-info">Discharged</span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="fw-bold">Admitted At</td>
+                                    <td>
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.admittedAt}">
+                                            <f:convertDateTime pattern="dd MMM yyyy HH:mm" timeZone="Asia/Colombo"/>
+                                        </h:outputText>
+                                    </td>
+                                    <td class="fw-bold">Discharged At</td>
+                                    <td>
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.dischargedAt}">
+                                            <f:convertDateTime pattern="dd MMM yyyy HH:mm" timeZone="Asia/Colombo"/>
+                                        </h:outputText>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="fw-bold">Duration</td>
+                                    <td colspan="3">
+                                        <span class="text-muted">(See admitted and discharged times above)</span>
+                                    </td>
+                                </tr>
+                            </table>
+
+                            <hr/>
+
+                            <!-- Discharge Information -->
+                            <table class="w-100" style="font-size:0.85rem;">
+                                <tr>
+                                    <td style="width:25%;" class="fw-bold">Discharged By</td>
+                                    <td style="width:25%;">
+                                        <h:outputText value="#{roomChangeController.roomForReceipt.dischargedBy.name}"/>
+                                    </td>
+                                    <td style="width:25%;" class="fw-bold">Printed By</td>
+                                    <td style="width:25%;">
+                                        <h:outputText value="#{sessionController.loggedUser.name}"/>
+                                    </td>
+                                </tr>
+                            </table>
+
+                            <!-- Footer -->
+                            <div class="text-center mt-4 text-muted" style="font-size:0.75rem;">
+                                <hr/>
+                                <p class="mb-0">This is a computer-generated receipt.</p>
+                            </div>
+                        </div>
+                    </h:panelGroup>
+
+                </h:form>
+
+                <!-- Auto-print on load when receipt is present -->
+                <h:panelGroup rendered="#{roomChangeController.roomForReceipt ne null}">
+                    <script type="text/javascript">
+                        //<![CDATA[
+                        window.onload = function() {
+                            setTimeout(function() {
+                                window.print();
+                            }, 500);
+                        };
+                        //]]>
+                    </script>
+                </h:panelGroup>
+
+                <!-- Print styling -->
+                <style type="text/css">
+                    @media print {
+                        .no-print, .no-print * {
+                            display: none !important;
+                        }
+                        body {
+                            margin: 0;
+                            padding: 10mm;
+                        }
+                        .border {
+                            border: none !important;
+                        }
+                    }
+                </style>
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>