diff --git a/src/main/java/com/divudi/bean/clinical/DischargeConditionController.java b/src/main/java/com/divudi/bean/clinical/DischargeConditionController.java
new file mode 100644
index 00000000000..b57fad799ab
--- /dev/null
+++ b/src/main/java/com/divudi/bean/clinical/DischargeConditionController.java
@@ -0,0 +1,228 @@
+/*
+ * Open Hospital Management Information System
+ *
+ * Dr M H B Ariyaratne
+ * Acting Consultant (Health Informatics)
+ */
+package com.divudi.bean.clinical;
+
+import com.divudi.bean.common.SessionController;
+import com.divudi.core.util.JsfUtil;
+import com.divudi.core.data.SymanticType;
+import com.divudi.core.entity.clinical.ClinicalEntity;
+import com.divudi.core.facade.ClinicalEntityFacade;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ejb.EJB;
+import javax.enterprise.context.SessionScoped;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+/**
+ * Manages configurable discharge condition values (e.g. Stable, DAMA, Referred)
+ * used in the clinical discharge workflow.
+ *
+ * @author Dr. M. H. B. Ariyaratne
+ */
+@Named
+@SessionScoped
+public class DischargeConditionController implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Inject
+    SessionController sessionController;
+
+    @EJB
+    private ClinicalEntityFacade ejbFacade;
+
+    private ClinicalEntity current;
+    private List<ClinicalEntity> items = null;
+    private String selectText = "";
+
+    public DischargeConditionController() {
+    }
+
+    public void prepareAdd() {
+        current = new ClinicalEntity();
+        current.setSymanticType(SymanticType.Discharge_Condition);
+    }
+
+    public void saveSelected() {
+        current.setSymanticType(SymanticType.Discharge_Condition);
+        if (getCurrent().getId() != null && getCurrent().getId() > 0) {
+            getFacade().edit(current);
+            JsfUtil.addSuccessMessage("Updated");
+        } else {
+            current.setCreatedAt(new Date());
+            current.setCreater(getSessionController().getLoggedUser());
+            getFacade().create(current);
+            JsfUtil.addSuccessMessage("Saved");
+        }
+        recreateModel();
+        getItems();
+    }
+
+    public void delete() {
+        if (current != null) {
+            current.setRetired(true);
+            current.setRetiredAt(new Date());
+            current.setRetirer(getSessionController().getLoggedUser());
+            getFacade().edit(current);
+            JsfUtil.addSuccessMessage("Deleted Successfully");
+        } else {
+            JsfUtil.addErrorMessage("Nothing to Delete");
+        }
+        recreateModel();
+        getItems();
+        current = null;
+        getCurrent();
+    }
+
+    public List<ClinicalEntity> getItems() {
+        if (items == null) {
+            Map m = new HashMap();
+            m.put("t", SymanticType.Discharge_Condition);
+            String sql = "select c from ClinicalEntity c where c.retired=false and c.symanticType=:t order by c.name";
+            items = getFacade().findByJpql(sql, m);
+        }
+        return items;
+    }
+
+    public List<ClinicalEntity> completeDischargeConditions(String qry) {
+        if (qry == null || qry.trim().isEmpty()) {
+            return new ArrayList<>();
+        }
+        List<ClinicalEntity> c;
+        Map m = new HashMap();
+        m.put("t", SymanticType.Discharge_Condition);
+        m.put("n", "%" + qry.toUpperCase() + "%");
+        String sql = "select c from ClinicalEntity c where c.retired=false and upper(c.name) like :n and c.symanticType=:t order by c.name";
+        c = getFacade().findByJpql(sql, m, 10);
+        if (c == null) {
+            c = new ArrayList<>();
+        }
+        return c;
+    }
+
+    public void downloadAsExcel() {
+        getItems();
+        FacesContext context = FacesContext.getCurrentInstance();
+        try (Workbook workbook = new XSSFWorkbook()) {
+            Sheet sheet = workbook.createSheet("Discharge Conditions");
+
+            Row headerRow = sheet.createRow(0);
+            headerRow.createCell(0).setCellValue("No");
+            headerRow.createCell(1).setCellValue("Name");
+            headerRow.createCell(2).setCellValue("Code");
+            headerRow.createCell(3).setCellValue("Description");
+
+            int rowNum = 1;
+            for (ClinicalEntity item : items) {
+                Row row = sheet.createRow(rowNum);
+                row.createCell(0).setCellValue(rowNum);
+                row.createCell(1).setCellValue(item.getName());
+                row.createCell(2).setCellValue(item.getCode());
+                row.createCell(3).setCellValue(item.getDescreption());
+                rowNum++;
+            }
+
+            HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment; filename=\"discharge_conditions.xlsx\"");
+
+            workbook.write(response.getOutputStream());
+            context.responseComplete();
+        } catch (Exception e) {
+            JsfUtil.addErrorMessage("Error generating Excel file: " + e.getMessage());
+        }
+    }
+
+    private void recreateModel() {
+        items = null;
+    }
+
+    private ClinicalEntityFacade getFacade() {
+        return ejbFacade;
+    }
+
+    public ClinicalEntity getCurrent() {
+        if (current == null) {
+            current = new ClinicalEntity();
+        }
+        return current;
+    }
+
+    public void setCurrent(ClinicalEntity current) {
+        this.current = current;
+    }
+
+    public String getSelectText() {
+        return selectText;
+    }
+
+    public void setSelectText(String selectText) {
+        this.selectText = selectText;
+    }
+
+    public SessionController getSessionController() {
+        return sessionController;
+    }
+
+    public void setSessionController(SessionController sessionController) {
+        this.sessionController = sessionController;
+    }
+
+    public ClinicalEntityFacade getEjbFacade() {
+        return ejbFacade;
+    }
+
+    public void setEjbFacade(ClinicalEntityFacade ejbFacade) {
+        this.ejbFacade = ejbFacade;
+    }
+
+    @FacesConverter("dischargeConditionConverter")
+    public static class DischargeConditionConverter implements Converter {
+
+        @Override
+        public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
+            if (value == null || value.length() == 0) {
+                return null;
+            }
+            try {
+                DischargeConditionController controller = (DischargeConditionController) facesContext.getApplication()
+                        .getELResolver().getValue(facesContext.getELContext(), null, "dischargeConditionController");
+                return controller.getEjbFacade().find(Long.valueOf(value));
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+
+        @Override
+        public String getAsString(FacesContext facesContext, UIComponent component, Object object) {
+            if (object == null) {
+                return null;
+            }
+            if (object instanceof ClinicalEntity) {
+                ClinicalEntity o = (ClinicalEntity) object;
+                return String.valueOf(o.getId());
+            } else {
+                throw new IllegalArgumentException("object " + object + " is of type "
+                        + object.getClass().getName() + "; expected type: ClinicalEntity");
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/divudi/bean/inward/BhtSummeryController.java b/src/main/java/com/divudi/bean/inward/BhtSummeryController.java
index 7d173a7cf24..2a92e99cf83 100644
--- a/src/main/java/com/divudi/bean/inward/BhtSummeryController.java
+++ b/src/main/java/com/divudi/bean/inward/BhtSummeryController.java
@@ -1620,6 +1620,10 @@ public void discharge() {
             return;
         }
 
+        if (!getPatientEncounter().isClinicallyDischarged()) {
+            JsfUtil.addErrorMessage("Warning: Clinical discharge has not been confirmed for this patient.");
+        }
+
         getPatientEncounter().setDateOfDischarge(date);
         getDischargeController().setCurrent((Admission) getPatientEncounter());
         getDischargeController().discharge();
diff --git a/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java b/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java
index 03b38edc751..5fe19f2af9a 100644
--- a/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java
+++ b/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java
@@ -163,6 +163,9 @@ public class InpatientClinicalDataController implements Serializable {
     private List<PatientEncounter> clinicalAssessments;
     private boolean viewOnly;
 
+    // Clinical discharge
+    private PatientEncounter clinicalDischargeRecord;
+
     @Inject
     private FavouriteController favouriteController;
 
@@ -2228,6 +2231,90 @@ public String navigateToDischargeMedicinesFromAdmission(PatientEncounter admissi
         return "/inward/inward_assessment_discharge_medicines?faces-redirect=true";
     }
 
+    public String navigateToClinicalDischargeFromAdmission(PatientEncounter admission) {
+        this.parentAdmission = admission;
+        clinicalDischargeRecord = findOrCreateClinicalDischargeRecord(admission);
+        this.current = clinicalDischargeRecord;
+        fillCurrentPatientLists(admission.getPatient());
+        fillCurrentEncounterLists(clinicalDischargeRecord);
+        return "/inward/inward_clinical_discharge?faces-redirect=true";
+    }
+
+    private PatientEncounter findOrCreateClinicalDischargeRecord(PatientEncounter admission) {
+        Map<String, Object> m = new HashMap<>();
+        m.put("parent", admission);
+        m.put("type", PatientEncounterType.ClinicalDischarge);
+        m.put("ret", false);
+        String sql = "select e from PatientEncounter e "
+                + "where e.parentEncounter=:parent "
+                + "and e.patientEncounterType=:type "
+                + "and e.retired=:ret "
+                + "order by e.id desc";
+        List<PatientEncounter> existing = ejbFacade.findByJpql(sql, m, 1);
+        if (existing != null && !existing.isEmpty()) {
+            return existing.get(0);
+        }
+        PatientEncounter record = new PatientEncounter();
+        record.setParentEncounter(admission);
+        record.setPatient(admission.getPatient());
+        record.setPatientEncounterType(PatientEncounterType.ClinicalDischarge);
+        record.setEncounterDateTime(new Date());
+        record.setInstitution(sessionController.getInstitution());
+        record.setDepartment(sessionController.getDepartment());
+        return record;
+    }
+
+    public void saveClinicalDischarge() {
+        if (clinicalDischargeRecord == null) {
+            JsfUtil.addErrorMessage("No clinical discharge record found.");
+            return;
+        }
+        clinicalDischargeRecord.setDepartment(sessionController.getDepartment());
+        if (clinicalDischargeRecord.getId() != null) {
+            getFacade().edit(clinicalDischargeRecord);
+            JsfUtil.addSuccessMessage("Clinical discharge details saved.");
+        } else {
+            clinicalDischargeRecord.setCreatedAt(new Date());
+            clinicalDischargeRecord.setCreater(sessionController.getLoggedUser());
+            getFacade().create(clinicalDischargeRecord);
+            JsfUtil.addSuccessMessage("Clinical discharge record created.");
+        }
+        fillCurrentEncounterLists(clinicalDischargeRecord);
+    }
+
+    public void confirmClinicalDischarge() {
+        if (clinicalDischargeRecord == null) {
+            JsfUtil.addErrorMessage("No clinical discharge record found.");
+            return;
+        }
+        saveClinicalDischarge();
+        parentAdmission.setClinicallyDischarged(Boolean.TRUE);
+        parentAdmission.setClinicalDischargeDateTime(new Date());
+        parentAdmission.setClinicalDischargedBy(sessionController.getLoggedUser());
+        getFacade().edit(parentAdmission);
+        JsfUtil.addSuccessMessage("Clinical discharge confirmed.");
+    }
+
+    public void cancelClinicalDischarge() {
+        if (parentAdmission == null) {
+            JsfUtil.addErrorMessage("No admission found.");
+            return;
+        }
+        parentAdmission.setClinicallyDischarged(Boolean.FALSE);
+        parentAdmission.setClinicalDischargeDateTime(null);
+        parentAdmission.setClinicalDischargedBy(null);
+        getFacade().edit(parentAdmission);
+        JsfUtil.addSuccessMessage("Clinical discharge cancelled.");
+    }
+
+    public PatientEncounter getClinicalDischargeRecord() {
+        return clinicalDischargeRecord;
+    }
+
+    public void setClinicalDischargeRecord(PatientEncounter clinicalDischargeRecord) {
+        this.clinicalDischargeRecord = clinicalDischargeRecord;
+    }
+
     public PatientEncounter getParentAdmission() {
         return parentAdmission;
     }
diff --git a/src/main/java/com/divudi/bean/inward/RoomChangeController.java b/src/main/java/com/divudi/bean/inward/RoomChangeController.java
index c71fdb518f3..26f0984f11c 100644
--- a/src/main/java/com/divudi/bean/inward/RoomChangeController.java
+++ b/src/main/java/com/divudi/bean/inward/RoomChangeController.java
@@ -20,6 +20,7 @@
 import com.divudi.core.entity.inward.PatientRoom;
 import com.divudi.core.entity.inward.RoomFacilityCharge;
 import com.divudi.core.facade.AdmissionFacade;
+import com.divudi.core.facade.PatientEncounterFacade;
 import com.divudi.core.facade.PatientFacade;
 import com.divudi.core.facade.PatientRoomFacade;
 import com.divudi.core.facade.PersonFacade;
@@ -69,6 +70,8 @@ public class RoomChangeController implements Serializable {
     @EJB
     private AdmissionFacade ejbFacade;
     @EJB
+    private PatientEncounterFacade patientEncounterFacade;
+    @EJB
     private PersonFacade personFacade;
     @EJB
     private PatientFacade patientFacade;
@@ -303,6 +306,14 @@ public void discharge(PatientRoom pR) {
         pR.setDischargedBy(getSessionController().getLoggedUser());
         getPatientRoomFacade().edit(pR);
         notificationController.createNotification(pR, "Discharge");
+
+        // Sync room discharge to the parent encounter when this is the last (current) room
+        if (pR.getNextRoom() == null && pR.getPatientEncounter() != null) {
+            com.divudi.core.entity.PatientEncounter encounter = pR.getPatientEncounter();
+            encounter.setRoomDischargeDateTime(pR.getDischargedAt());
+            encounter.setRoomDischargedBy(getSessionController().getLoggedUser());
+            patientEncounterFacade.edit(encounter);
+        }
     }
 
     public void dischargeWithCurrentTime(PatientRoom pR) {
@@ -330,6 +341,14 @@ public void dischargeWithCurrentTime(PatientRoom pR) {
         pR.setDischargedBy(getSessionController().getLoggedUser());
         getPatientRoomFacade().edit(pR);
         notificationController.createNotification(pR, "Discharge");
+
+        // Sync room discharge to the parent encounter when this is the last (current) room
+        if (pR.getNextRoom() == null && pR.getPatientEncounter() != null) {
+            com.divudi.core.entity.PatientEncounter encounter = pR.getPatientEncounter();
+            encounter.setRoomDischargeDateTime(pR.getDischargedAt());
+            encounter.setRoomDischargedBy(getSessionController().getLoggedUser());
+            patientEncounterFacade.edit(encounter);
+        }
     }
 
     public void dischargeCancel(PatientRoom pR) {
diff --git a/src/main/java/com/divudi/core/data/Privileges.java b/src/main/java/com/divudi/core/data/Privileges.java
index 05eef470be4..d9af956b547 100644
--- a/src/main/java/com/divudi/core/data/Privileges.java
+++ b/src/main/java/com/divudi/core/data/Privileges.java
@@ -119,6 +119,7 @@ public enum Privileges {
     InwardBillSettleWithoutCheck("Inward Bill Settle Without Check"),
     TheaterIssueBHT("Theater Issue BHT"),
     InpatientClinicalAssessment("Inpatient Clinical Assessment"),
+    InpatientClinicalDischarge("Inpatient Clinical Discharge"),
     //</editor-fold>
     
     //<editor-fold defaultstate="collapsed" desc="Nurse">
@@ -1013,6 +1014,7 @@ public String getCategory() {
             case InwardAppointmentUpdate:
             case InwardAppointmentCancel:
             case InpatientClinicalAssessment:
+            case InpatientClinicalDischarge:
                 return "Inward";
 
             default:
diff --git a/src/main/java/com/divudi/core/data/SymanticType.java b/src/main/java/com/divudi/core/data/SymanticType.java
index 0afaae812b8..9099bd634d6 100644
--- a/src/main/java/com/divudi/core/data/SymanticType.java
+++ b/src/main/java/com/divudi/core/data/SymanticType.java
@@ -159,5 +159,6 @@ public enum SymanticType {
     Employment,
     Blood_Group,
     Civil_status,
-    Relationships
+    Relationships,
+    Discharge_Condition
 }
diff --git a/src/main/java/com/divudi/core/data/inward/PatientEncounterType.java b/src/main/java/com/divudi/core/data/inward/PatientEncounterType.java
index 1c422a597a5..7ce5a21a1ab 100644
--- a/src/main/java/com/divudi/core/data/inward/PatientEncounterType.java
+++ b/src/main/java/com/divudi/core/data/inward/PatientEncounterType.java
@@ -15,5 +15,6 @@ public enum PatientEncounterType {
     Procedure,
     ETU,
     ClinicalAssessment,
+    ClinicalDischarge,
 
 }
diff --git a/src/main/java/com/divudi/core/entity/PatientEncounter.java b/src/main/java/com/divudi/core/entity/PatientEncounter.java
index 76ec8470c62..153c5284558 100644
--- a/src/main/java/com/divudi/core/entity/PatientEncounter.java
+++ b/src/main/java/com/divudi/core/entity/PatientEncounter.java
@@ -102,6 +102,19 @@ public class PatientEncounter implements Serializable, RetirableEntity {
     Date timeOfDischarge;
     @Temporal(javax.persistence.TemporalType.TIMESTAMP)
     Date dateOfDischarge;
+
+    // Clinical discharge — set on the parent admission when doctor confirms clinical clearance
+    Boolean clinicallyDischarged = false;
+    @Temporal(javax.persistence.TemporalType.TIMESTAMP)
+    private Date clinicalDischargeDateTime;
+    @ManyToOne
+    private WebUser clinicalDischargedBy;
+
+    // Room discharge mirror — set on the parent admission when the last room is vacated
+    @Temporal(javax.persistence.TemporalType.TIMESTAMP)
+    private Date roomDischargeDateTime;
+    @ManyToOne
+    private WebUser roomDischargedBy;
     double creditLimit;
     double creditUsedAmount;
     private double creditPaidAmount;
@@ -307,6 +320,16 @@ public void setClaimable(boolean claimable) {
     String comments;
     @Lob
     private String planOfAction;
+
+    // Clinical discharge content fields — used on the child ClinicalDischarge record
+    @ManyToOne
+    private ClinicalEntity dischargeCondition;
+    @Lob
+    private String followUpPlan;
+    @Lob
+    private String activityInstructions;
+    @Lob
+    private String dietInstructions;
     @Transient
     List<ClinicalFindingValue> diagnosis;
     @ManyToOne
@@ -846,6 +869,82 @@ public void setPrintingDischargeTime(Date printingDischargeTime) {
         this.printingDischargeTime = printingDischargeTime;
     }
 
+    public Boolean getClinicallyDischarged() {
+        return clinicallyDischarged;
+    }
+
+    public boolean isClinicallyDischarged() {
+        return Boolean.TRUE.equals(clinicallyDischarged);
+    }
+
+    public void setClinicallyDischarged(Boolean clinicallyDischarged) {
+        this.clinicallyDischarged = clinicallyDischarged;
+    }
+
+    public Date getClinicalDischargeDateTime() {
+        return clinicalDischargeDateTime;
+    }
+
+    public void setClinicalDischargeDateTime(Date clinicalDischargeDateTime) {
+        this.clinicalDischargeDateTime = clinicalDischargeDateTime;
+    }
+
+    public WebUser getClinicalDischargedBy() {
+        return clinicalDischargedBy;
+    }
+
+    public void setClinicalDischargedBy(WebUser clinicalDischargedBy) {
+        this.clinicalDischargedBy = clinicalDischargedBy;
+    }
+
+    public Date getRoomDischargeDateTime() {
+        return roomDischargeDateTime;
+    }
+
+    public void setRoomDischargeDateTime(Date roomDischargeDateTime) {
+        this.roomDischargeDateTime = roomDischargeDateTime;
+    }
+
+    public WebUser getRoomDischargedBy() {
+        return roomDischargedBy;
+    }
+
+    public void setRoomDischargedBy(WebUser roomDischargedBy) {
+        this.roomDischargedBy = roomDischargedBy;
+    }
+
+    public ClinicalEntity getDischargeCondition() {
+        return dischargeCondition;
+    }
+
+    public void setDischargeCondition(ClinicalEntity dischargeCondition) {
+        this.dischargeCondition = dischargeCondition;
+    }
+
+    public String getFollowUpPlan() {
+        return followUpPlan;
+    }
+
+    public void setFollowUpPlan(String followUpPlan) {
+        this.followUpPlan = followUpPlan;
+    }
+
+    public String getActivityInstructions() {
+        return activityInstructions;
+    }
+
+    public void setActivityInstructions(String activityInstructions) {
+        this.activityInstructions = activityInstructions;
+    }
+
+    public String getDietInstructions() {
+        return dietInstructions;
+    }
+
+    public void setDietInstructions(String dietInstructions) {
+        this.dietInstructions = dietInstructions;
+    }
+
     public Bill getFinalBill() {
         return finalBill;
     }
diff --git a/src/main/webapp/emr/admin/discharge_conditions.xhtml b/src/main/webapp/emr/admin/discharge_conditions.xhtml
new file mode 100644
index 00000000000..707067e5318
--- /dev/null
+++ b/src/main/webapp/emr/admin/discharge_conditions.xhtml
@@ -0,0 +1,99 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                template="/forms/index.xhtml"
+                xmlns:h="http://xmlns.jcp.org/jsf/html"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:p="http://primefaces.org/ui">
+    <ui:define name="subcontent">
+        <h:form rendered="#{webUserController.hasPrivilege('InpatientClinicalDischarge')}">
+            <p:growl/>
+            <p:focus id="selectFocus" context="gpSelect"/>
+            <p:focus id="detailFocus" context="gpDetail"/>
+            <p:panel header="Manage Discharge Conditions">
+                <div class="container-fluid">
+                    <div class="row">
+                        <div class="col-md-5">
+                            <h:panelGrid columns="3" class="w-100">
+                                <p:commandButton id="btnAdd"
+                                                 value="Add"
+                                                 class="w-100"
+                                                 update="gpDetail lstSelect detailFocus"
+                                                 action="#{dischargeConditionController.prepareAdd()}">
+                                </p:commandButton>
+                                <p:commandButton id="btnDelete"
+                                                 ajax="false"
+                                                 onclick="if (!confirm('Are you sure you want to delete this record?')) return false;"
+                                                 class="w-100"
+                                                 action="#{dischargeConditionController.delete()}"
+                                                 process="lstSelect btnDelete"
+                                                 update="lstSelect gpDetail"
+                                                 value="Delete">
+                                </p:commandButton>
+                                <p:commandButton
+                                    value="Download as Excel"
+                                    class="w-100"
+                                    ajax="false"
+                                    action="#{dischargeConditionController.downloadAsExcel}"/>
+                            </h:panelGrid>
+
+                            <h:panelGrid id="gpSelect" class="w-100">
+                                <p:selectOneListbox id="lstSelect"
+                                                    filter="true"
+                                                    filterMatchMode="contains"
+                                                    scrollHeight="500"
+                                                    value="#{dischargeConditionController.current}">
+                                    <f:selectItems value="#{dischargeConditionController.items}"
+                                                   var="myItem"
+                                                   itemValue="#{myItem}"
+                                                   itemLabel="#{myItem.name}"/>
+                                    <f:converter converterId="dischargeConditionConverter"/>
+                                    <f:ajax render="gpDetail" execute="lstSelect"/>
+                                </p:selectOneListbox>
+                            </h:panelGrid>
+                        </div>
+
+                        <div class="col-md-7">
+                            <h:panelGroup id="gpDetail">
+                                <div class="form-group row">
+                                    <p:outputLabel for="txtName" value="Name" styleClass="col-sm-2 col-form-label"/>
+                                    <div class="col-sm-10">
+                                        <p:inputText autocomplete="off" id="txtName"
+                                                     value="#{dischargeConditionController.current.name}"
+                                                     styleClass="form-control"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <p:outputLabel for="txtCode" value="Code" styleClass="col-sm-2 col-form-label"/>
+                                    <div class="col-sm-10">
+                                        <p:inputText autocomplete="off" id="txtCode"
+                                                     value="#{dischargeConditionController.current.code}"
+                                                     styleClass="form-control"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <p:outputLabel for="txtDes" value="Description" styleClass="col-sm-2 col-form-label"/>
+                                    <div class="col-sm-10">
+                                        <p:inputTextarea id="txtDes"
+                                                         value="#{dischargeConditionController.current.descreption}"
+                                                         styleClass="form-control"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <div class="col-sm-10">
+                                        <p:commandButton id="btnSave"
+                                                         value="Save"
+                                                         process="gpDetail"
+                                                         update="lstSelect selectFocus"
+                                                         action="#{dischargeConditionController.saveSelected()}"/>
+                                    </div>
+                                </div>
+                            </h:panelGroup>
+                        </div>
+                    </div>
+                </div>
+            </p:panel>
+        </h:form>
+    </ui:define>
+</ui:composition>
diff --git a/src/main/webapp/inward/admission_profile.xhtml b/src/main/webapp/inward/admission_profile.xhtml
index bab279c2810..b9030bb8885 100644
--- a/src/main/webapp/inward/admission_profile.xhtml
+++ b/src/main/webapp/inward/admission_profile.xhtml
@@ -422,6 +422,15 @@
                                     icon="fa fa-prescription-bottle-alt"
                                     class="w-100">
                                 </p:commandButton>
+                                <p:commandButton
+                                    value="Clinical Discharge"
+                                    ajax="false"
+                                    action="#{inpatientClinicalDataController.navigateToClinicalDischargeFromAdmission(admissionController.current)}"
+                                    icon="fa fa-sign-out-alt"
+                                    title="Navigate to Clinical Discharge"
+                                    rendered="#{webUserController.hasPrivilege('InpatientClinicalDischarge')}"
+                                    styleClass="w-100 #{admissionController.current.clinicallyDischarged ? 'ui-button-success' : 'ui-button-warning'}">
+                                </p:commandButton>
                                 <p:commandButton 
                                     value="Drug Chart" 
                                     ajax="false"
diff --git a/src/main/webapp/inward/inward_clinical_discharge.xhtml b/src/main/webapp/inward/inward_clinical_discharge.xhtml
new file mode 100644
index 00000000000..7ce72add000
--- /dev/null
+++ b/src/main/webapp/inward/inward_clinical_discharge.xhtml
@@ -0,0 +1,295 @@
+<?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">
+    <h:body>
+        <ui:composition template="/resources/template/template.xhtml">
+            <ui:define name="content">
+
+                <h:form id="formClinicalDischarge">
+                    <p:growl id="growl" life="4000"/>
+
+                    <!-- Navigation bar -->
+                    <div class="row">
+                        <div class="col-12 px-4">
+                            <p:commandButton
+                                value="Inpatient Dashboard"
+                                ajax="false"
+                                action="#{admissionController.navigateToAdmissionProfilePage}"
+                                icon="fa fa-id-card"
+                                class="p-0 m-1">
+                                <f:setPropertyActionListener
+                                    value="#{inpatientClinicalDataController.parentAdmission}"
+                                    target="#{admissionController.current}" />
+                            </p:commandButton>
+                            <p:commandButton
+                                value="Discharge Medications"
+                                ajax="false"
+                                action="#{inpatientClinicalDataController.navigateToAssessmentDischargeMedicines()}"
+                                icon="fa fa-prescription-bottle-alt"
+                                class="p-0 m-1"
+                                disabled="#{inpatientClinicalDataController.clinicalDischargeRecord == null or inpatientClinicalDataController.clinicalDischargeRecord.id == null}"
+                                title="Save the clinical discharge first">
+                            </p:commandButton>
+                        </div>
+                    </div>
+
+                    <!-- Access denied panel -->
+                    <h:panelGroup layout="block" rendered="#{not webUserController.hasPrivilege('InpatientClinicalDischarge')}">
+                        <div class="row px-4">
+                            <div class="col-12">
+                                <p:panel class="m-1">
+                                    <h:outputText value="You do not have permission to access Clinical Discharge." />
+                                </p:panel>
+                            </div>
+                        </div>
+                    </h:panelGroup>
+
+                    <!-- Main content -->
+                    <h:panelGroup layout="block" rendered="#{webUserController.hasPrivilege('InpatientClinicalDischarge')}">
+
+                        <!-- Confirmation status banner -->
+                        <h:panelGroup layout="block"
+                                      rendered="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}">
+                            <div class="row px-4 pt-2">
+                                <div class="col-12">
+                                    <div class="alert alert-success" role="alert">
+                                        <i class="fa fa-check-circle mr-2"/>
+                                        Clinically discharged by
+                                        <strong>#{inpatientClinicalDataController.parentAdmission.clinicalDischargedBy.name}</strong>
+                                        on
+                                        <h:outputText value="#{inpatientClinicalDataController.parentAdmission.clinicalDischargeDateTime}">
+                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                        </h:outputText>
+                                    </div>
+                                </div>
+                            </div>
+                        </h:panelGroup>
+
+                        <div class="row px-4 py-2">
+                            <div class="col-12">
+
+                                <!-- Discharge Details panel -->
+                                <p:panel class="w-100 m-1 p-0 mb-2">
+                                    <f:facet name="header">
+                                        <i class="fa fa-sign-out-alt mr-2"/>
+                                        <h:outputText value="Discharge Details" />
+                                    </f:facet>
+                                    <div class="container-fluid">
+                                        <div class="row my-2">
+                                            <div class="col-md-6">
+                                                <p:outputLabel for="cmbCondition" value="Discharge Condition:" styleClass="font-weight-bold" />
+                                                <p:autoComplete
+                                                    id="cmbCondition"
+                                                    value="#{inpatientClinicalDataController.clinicalDischargeRecord.dischargeCondition}"
+                                                    completeMethod="#{dischargeConditionController.completeDischargeConditions}"
+                                                    var="dc"
+                                                    itemLabel="#{dc.name}"
+                                                    itemValue="#{dc}"
+                                                    forceSelection="true"
+                                                    class="w-100"
+                                                    inputStyleClass="w-100"
+                                                    disabled="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}"
+                                                    placeholder="Select discharge condition" />
+                                            </div>
+                                            <div class="col-md-6">
+                                                <p:outputLabel for="txtDischargeDateTime" value="Discharge Date/Time:" styleClass="font-weight-bold" />
+                                                <p:inputText
+                                                    id="txtDischargeDateTime"
+                                                    value="#{inpatientClinicalDataController.clinicalDischargeRecord.encounterDateTime}"
+                                                    disabled="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}"
+                                                    style="width:200px;">
+                                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                </p:inputText>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </p:panel>
+
+                                <!-- Discharge Diagnoses panel -->
+                                <p:panel id="panelDischargeDiagnoses" class="w-100 m-1 p-0 mb-2">
+                                    <f:facet name="header">
+                                        <i class="fa fa-stethoscope mr-2"/>
+                                        <h:outputText value="Discharge Diagnoses" />
+                                    </f:facet>
+                                    <div class="container-fluid">
+                                        <h:panelGroup layout="block"
+                                                      rendered="#{not inpatientClinicalDataController.parentAdmission.clinicallyDischarged}">
+                                            <div class="row my-2">
+                                                <div class="col-md-9">
+                                                    <p:autoComplete
+                                                        id="acDischargeDx"
+                                                        value="#{inpatientClinicalDataController.diagnosis}"
+                                                        completeMethod="#{diagnosisController.completeDiagnosis}"
+                                                        var="dx"
+                                                        forceSelection="true"
+                                                        itemLabel="#{dx.name}"
+                                                        itemValue="#{dx}"
+                                                        class="w-100"
+                                                        inputStyleClass="w-100"
+                                                        placeholder="Search diagnosis" />
+                                                </div>
+                                                <div class="col-md-3">
+                                                    <p:commandButton
+                                                        ajax="true"
+                                                        id="btnAddDischargeDx"
+                                                        action="#{inpatientClinicalDataController.addDx}"
+                                                        process="acDischargeDx btnAddDischargeDx"
+                                                        update="acDischargeDx panelDischargeDiagnoses"
+                                                        icon="pi pi-plus"
+                                                        value="Add"
+                                                        disabled="#{inpatientClinicalDataController.clinicalDischargeRecord == null or inpatientClinicalDataController.clinicalDischargeRecord.id == null}"
+                                                        title="Save the record first before adding diagnoses" />
+                                                </div>
+                                            </div>
+                                        </h:panelGroup>
+                                        <h:panelGroup id="gpDischargeDx">
+                                            <p:dataTable
+                                                id="tblDischargeDx"
+                                                rendered="#{inpatientClinicalDataController.encounterDiagnoses ne null and inpatientClinicalDataController.encounterDiagnoses.size() > 0}"
+                                                value="#{inpatientClinicalDataController.encounterDiagnoses}"
+                                                emptyMessage="No diagnosis added yet"
+                                                var="edx"
+                                                class="w-100">
+                                                <p:column headerText="Diagnosis">
+                                                    <h:outputLabel value="#{edx.itemValue.name}" />
+                                                    <p:commandLink
+                                                        id="clRemoveDischargeDx"
+                                                        value=" (X)"
+                                                        process="clRemoveDischargeDx"
+                                                        action="#{inpatientClinicalDataController.removeEncounterDiagnoses()}"
+                                                        update=":#{p:resolveFirstComponentWithId('tblDischargeDx',view).clientId}"
+                                                        rendered="#{not inpatientClinicalDataController.parentAdmission.clinicallyDischarged}">
+                                                        <f:setPropertyActionListener value="#{edx}" target="#{inpatientClinicalDataController.removingCfv}" />
+                                                    </p:commandLink>
+                                                </p:column>
+                                                <p:column headerText="Details">
+                                                    <h:outputLabel value="#{edx.lobValue}" />
+                                                </p:column>
+                                            </p:dataTable>
+                                        </h:panelGroup>
+                                    </div>
+                                </p:panel>
+
+                                <!-- Discharge Summary panel -->
+                                <p:panel class="w-100 m-1 p-0 mb-2">
+                                    <f:facet name="header">
+                                        <i class="fa fa-file-medical-alt mr-2"/>
+                                        <h:outputText value="Discharge Summary" />
+                                    </f:facet>
+                                    <div class="container-fluid">
+                                        <div class="row my-2">
+                                            <div class="col-12">
+                                                <p:outputLabel for="txtDischargeSummary" value="Discharge Summary / Clinical Notes:" styleClass="font-weight-bold" />
+                                                <p:inputTextarea
+                                                    id="txtDischargeSummary"
+                                                    value="#{inpatientClinicalDataController.clinicalDischargeRecord.comments}"
+                                                    class="w-100"
+                                                    autoResize="true"
+                                                    rows="6"
+                                                    placeholder="Enter discharge summary, course in hospital, investigations, treatments given, etc."
+                                                    disabled="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </p:panel>
+
+                                <!-- Follow-up Plan panel -->
+                                <p:panel class="w-100 m-1 p-0 mb-2">
+                                    <f:facet name="header">
+                                        <i class="fa fa-calendar-check mr-2"/>
+                                        <h:outputText value="Follow-up Plan" />
+                                    </f:facet>
+                                    <div class="container-fluid">
+                                        <div class="row my-2">
+                                            <div class="col-12">
+                                                <p:inputTextarea
+                                                    id="txtFollowUp"
+                                                    value="#{inpatientClinicalDataController.clinicalDischargeRecord.followUpPlan}"
+                                                    class="w-100"
+                                                    autoResize="true"
+                                                    rows="4"
+                                                    placeholder="e.g. Review at OPD in 2 weeks, referral to specialist, etc."
+                                                    disabled="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </p:panel>
+
+                                <!-- Activity and Diet panel -->
+                                <p:panel class="w-100 m-1 p-0 mb-2">
+                                    <f:facet name="header">
+                                        <i class="fa fa-walking mr-2"/>
+                                        <h:outputText value="Activity and Diet Instructions" />
+                                    </f:facet>
+                                    <div class="container-fluid">
+                                        <div class="row my-2">
+                                            <div class="col-md-6">
+                                                <p:outputLabel for="txtActivity" value="Activity Restrictions:" styleClass="font-weight-bold" />
+                                                <p:inputTextarea
+                                                    id="txtActivity"
+                                                    value="#{inpatientClinicalDataController.clinicalDischargeRecord.activityInstructions}"
+                                                    class="w-100"
+                                                    autoResize="true"
+                                                    rows="4"
+                                                    placeholder="e.g. Bed rest for 1 week, no heavy lifting, return to work after 2 weeks, etc."
+                                                    disabled="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}" />
+                                            </div>
+                                            <div class="col-md-6">
+                                                <p:outputLabel for="txtDiet" value="Diet Instructions:" styleClass="font-weight-bold" />
+                                                <p:inputTextarea
+                                                    id="txtDiet"
+                                                    value="#{inpatientClinicalDataController.clinicalDischargeRecord.dietInstructions}"
+                                                    class="w-100"
+                                                    autoResize="true"
+                                                    rows="4"
+                                                    placeholder="e.g. Low salt diet, diabetic diet, avoid oily food, etc."
+                                                    disabled="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </p:panel>
+
+                                <!-- Action buttons -->
+                                <div class="d-flex justify-content-end my-2 mb-4">
+                                    <h:panelGroup rendered="#{not inpatientClinicalDataController.parentAdmission.clinicallyDischarged}">
+                                        <p:commandButton
+                                            id="btnSaveDraft"
+                                            value="Save Draft"
+                                            ajax="false"
+                                            action="#{inpatientClinicalDataController.saveClinicalDischarge()}"
+                                            icon="pi pi-save"
+                                            class="ui-button-secondary mx-1" />
+                                        <p:commandButton
+                                            id="btnConfirm"
+                                            value="Confirm Clinical Discharge"
+                                            ajax="false"
+                                            action="#{inpatientClinicalDataController.confirmClinicalDischarge()}"
+                                            icon="fa fa-check"
+                                            class="ui-button-success mx-1"
+                                            onclick="return confirm('Are you sure you want to confirm clinical discharge? This will lock the record.')" />
+                                    </h:panelGroup>
+                                    <h:panelGroup rendered="#{inpatientClinicalDataController.parentAdmission.clinicallyDischarged}">
+                                        <p:commandButton
+                                            id="btnCancelDischarge"
+                                            value="Cancel Clinical Discharge"
+                                            ajax="false"
+                                            action="#{inpatientClinicalDataController.cancelClinicalDischarge()}"
+                                            icon="fa fa-times"
+                                            class="ui-button-warning mx-1"
+                                            onclick="return confirm('Are you sure you want to cancel the clinical discharge confirmation?')" />
+                                    </h:panelGroup>
+                                </div>
+
+                            </div>
+                        </div>
+                    </h:panelGroup>
+
+                </h:form>
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>