diff --git a/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java b/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java
index 51edf87b59c..14954dde305 100644
--- a/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java
+++ b/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java
@@ -10,6 +10,7 @@
 
 import com.divudi.bean.clinical.*;
 import com.divudi.bean.common.BillController;
+import com.divudi.bean.common.ConfigOptionApplicationController;
 import com.divudi.bean.common.SearchController;
 import com.divudi.bean.common.SessionController;
 
@@ -143,6 +144,9 @@ public class InpatientClinicalDataController implements Serializable {
     @Inject
     private FavouriteController favouriteController;
 
+    @Inject
+    private ConfigOptionApplicationController configOptionApplicationController;
+
     private Patient patient;
 
     private List<DocumentTemplate> userDocumentTemplates;
@@ -227,6 +231,11 @@ public class InpatientClinicalDataController implements Serializable {
 
     private Upload selectedDiagnosisCardTemplate;
     private Upload selectedDiagnosisCard;
+    
+    // Diagnosis card types - Ward Admission and Local Surgery
+    private String wardAdmissionDiagnosisCardHtml;
+    private String localSurgeryDiagnosisCardHtml;
+    private String selectedDiagnosisCardTypeHtml;
 
     @Deprecated
     public void calculateBmi() {
@@ -481,6 +490,55 @@ public Upload findAndReplaceText(Upload upload, Map<String, String> replacements
         return upload;
     }
 
+    /**
+     * Load and display Ward Admission Diagnosis Card with variable replacement
+     */
+    public void loadWardAdmissionDiagnosisCard() {
+        if (current == null) {
+            JsfUtil.addErrorMessage("No patient encounter selected");
+            return;
+        }
+        String templateHtml = configOptionApplicationController.getLongTextValueByKey("Ward Admission Diagnosis Card Template", "");
+        if (templateHtml == null || templateHtml.isEmpty()) {
+            JsfUtil.addErrorMessage("Ward Admission Diagnosis Card template not configured");
+            return;
+        }
+        Map<String, String> replacements = createReplacementsMap(current);
+        wardAdmissionDiagnosisCardHtml = replaceVariablesInHtml(templateHtml, replacements);
+        selectedDiagnosisCardTypeHtml = wardAdmissionDiagnosisCardHtml;
+    }
+
+    /**
+     * Load and display Local Surgery Diagnosis Card with variable replacement
+     */
+    public void loadLocalSurgeryDiagnosisCard() {
+        if (current == null) {
+            JsfUtil.addErrorMessage("No patient encounter selected");
+            return;
+        }
+        String templateHtml = configOptionApplicationController.getLongTextValueByKey("Local Surgery Diagnosis Card Template", "");
+        if (templateHtml == null || templateHtml.isEmpty()) {
+            JsfUtil.addErrorMessage("Local Surgery Diagnosis Card template not configured");
+            return;
+        }
+        Map<String, String> replacements = createReplacementsMap(current);
+        localSurgeryDiagnosisCardHtml = replaceVariablesInHtml(templateHtml, replacements);
+        selectedDiagnosisCardTypeHtml = localSurgeryDiagnosisCardHtml;
+    }
+
+    /**
+     * Replace variables in HTML with actual values using the replacements map
+     */
+    public String replaceVariablesInHtml(String htmlTemplate, Map<String, String> replacements) {
+        String result = htmlTemplate;
+        for (Map.Entry<String, String> replacement : replacements.entrySet()) {
+            if (replacement.getValue() != null) {
+                result = result.replace("{{" + replacement.getKey().substring(1, replacement.getKey().length() - 1) + "}}", replacement.getValue());
+            }
+        }
+        return result;
+    }
+
     public String generateDocumentFromTemplate(DocumentTemplate t, PatientEncounter e) {
 
         if (t == null) {
@@ -3189,6 +3247,30 @@ public Upload getSelectedDiagnosisCard() {
         return selectedDiagnosisCard;
     }
 
+    public String getWardAdmissionDiagnosisCardHtml() {
+        return wardAdmissionDiagnosisCardHtml;
+    }
+
+    public void setWardAdmissionDiagnosisCardHtml(String wardAdmissionDiagnosisCardHtml) {
+        this.wardAdmissionDiagnosisCardHtml = wardAdmissionDiagnosisCardHtml;
+    }
+
+    public String getLocalSurgeryDiagnosisCardHtml() {
+        return localSurgeryDiagnosisCardHtml;
+    }
+
+    public void setLocalSurgeryDiagnosisCardHtml(String localSurgeryDiagnosisCardHtml) {
+        this.localSurgeryDiagnosisCardHtml = localSurgeryDiagnosisCardHtml;
+    }
+
+    public String getSelectedDiagnosisCardTypeHtml() {
+        return selectedDiagnosisCardTypeHtml;
+    }
+
+    public void setSelectedDiagnosisCardTypeHtml(String selectedDiagnosisCardTypeHtml) {
+        this.selectedDiagnosisCardTypeHtml = selectedDiagnosisCardTypeHtml;
+    }
+
     public void setSelectedDiagnosisCard(Upload selectedDiagnosisCard) {
         this.selectedDiagnosisCard = selectedDiagnosisCard;
     }
diff --git a/src/main/webapp/inward/admission_profile.xhtml b/src/main/webapp/inward/admission_profile.xhtml
index 6cac7790549..b272ed02b6b 100644
--- a/src/main/webapp/inward/admission_profile.xhtml
+++ b/src/main/webapp/inward/admission_profile.xhtml
@@ -345,12 +345,32 @@
                                     class="w-100">
                                 </p:commandButton>
                                 <p:commandButton 
-                                    value="Diagnosis Card" 
+                                    value="Diagnosis Card (Legacy)" 
                                     ajax="false"
                                     action="#{admissionController.navigateToInpatientDiagnosisCard()}" 
                                     icon="fa fa-diagnoses" 
                                     class="w-100">
                                 </p:commandButton>
+                                <p:commandButton 
+                                    value="Ward Admission Card" 
+                                    ajax="true"
+                                    icon="pi pi-document"
+                                    styleClass="ui-button-success w-100"
+                                    action="#{inpatientClinicalDataController.loadWardAdmissionDiagnosisCard}"
+                                    oncomplete="PF('wardDiagnosisDialogDashboard').show()"
+                                    process="@this"
+                                    update="wardDiagnosisPanelDashboard">
+                                </p:commandButton>
+                                <p:commandButton 
+                                    value="Local Surgery Card" 
+                                    ajax="true"
+                                    icon="pi pi-document"
+                                    styleClass="ui-button-info w-100"
+                                    action="#{inpatientClinicalDataController.loadLocalSurgeryDiagnosisCard}"
+                                    oncomplete="PF('surgeryDiagnosisDialogDashboard').show()"
+                                    process="@this"
+                                    update="surgeryDiagnosisPanelDashboard">
+                                </p:commandButton>
                             </div>
                         </p:panel>
 
@@ -525,6 +545,64 @@
                 </div>
             </p:panel>
 
+            <!-- Ward Admission Diagnosis Card Dialog - Dashboard -->
+            <p:dialog id="wardDiagnosisDlgDashboard" widgetVar="wardDiagnosisDialogDashboard" modal="true" width="90%" height="90%" header="Ward Admission Diagnosis Card">
+                <h:panelGroup id="wardDiagnosisPanelDashboard">
+                    <div class="card">
+                        <div class="card-body">
+                            <h:outputText value="#{inpatientClinicalDataController.wardAdmissionDiagnosisCardHtml}" escape="false" rendered="#{inpatientClinicalDataController.wardAdmissionDiagnosisCardHtml ne null}"/>
+                        </div>
+                        <div class="card-footer">
+                            <p:commandButton 
+                                value="Print" 
+                                ajax="true" 
+                                icon="pi pi-print"
+                                styleClass="ui-button-success">
+                                <p:printer target="wardDiagnosisPanelDashboard" />
+                            </p:commandButton>
+                            <p:commandButton 
+                                value="Close" 
+                                ajax="true" 
+                                icon="pi pi-times"
+                                oncomplete="PF('wardDiagnosisDialogDashboard').hide()"
+                                styleClass="ui-button-secondary">
+                            </p:commandButton>
+                        </div>
+                    </div>
+                </h:panelGroup>
+            </p:dialog>
+
+            <!-- Local Surgery Diagnosis Card Dialog - Dashboard -->
+            <p:dialog id="surgeryDiagnosisDlgDashboard" widgetVar="surgeryDiagnosisDialogDashboard" modal="true" width="90%" height="90%" header="Local Surgery Diagnosis Card">
+                <h:panelGroup id="surgeryDiagnosisPanelDashboard">
+                    <div class="card">
+                        <div class="card-body">
+                            <h:outputText value="#{inpatientClinicalDataController.localSurgeryDiagnosisCardHtml}" escape="false" rendered="#{inpatientClinicalDataController.localSurgeryDiagnosisCardHtml ne null}"/>
+                        </div>
+                        <div class="card-footer">
+                            <p:commandButton 
+                                value="Print" 
+                                ajax="true" 
+                                icon="pi pi-print"
+                                styleClass="ui-button-success">
+                                <p:printer target="surgeryDiagnosisPanelDashboard" />
+                            </p:commandButton>
+                            <p:commandButton 
+                                value="Close" 
+                                ajax="true" 
+                                icon="pi pi-times"
+                                oncomplete="PF('surgeryDiagnosisDialogDashboard').hide()"
+                                styleClass="ui-button-secondary">
+                            </p:commandButton>
+                        </div>
+                    </div>
+                </h:panelGroup>
+            </p:dialog>
+
+        </h:form>
+    </ui:define>
+</ui:composition>
+
 
 
 
diff --git a/src/main/webapp/inward/clinical_data.xhtml b/src/main/webapp/inward/clinical_data.xhtml
index 5249d83686d..e2d96575d30 100644
--- a/src/main/webapp/inward/clinical_data.xhtml
+++ b/src/main/webapp/inward/clinical_data.xhtml
@@ -56,6 +56,29 @@
                                 <f:setPropertyActionListener value="#{bhtEditController.current.patient}" target="#{patientController.current}" ></f:setPropertyActionListener>
                             </p:commandButton>
 
+                            <!-- Diagnosis Card Type Buttons -->
+                            <p:commandButton 
+                                ajax="true" 
+                                icon="pi pi-document"
+                                value="Ward Admission Card" 
+                                class="m-1 p-0 ui-button-success"
+                                action="#{inpatientClinicalDataController.loadWardAdmissionDiagnosisCard}"
+                                oncomplete="PF('wardDiagnosisDialog').show()"
+                                process="@this"
+                                update="wardDiagnosisPanel">
+                            </p:commandButton>
+
+                            <p:commandButton 
+                                ajax="true" 
+                                icon="pi pi-document"
+                                value="Surgery Card" 
+                                class="m-1 p-0 ui-button-info"
+                                action="#{inpatientClinicalDataController.loadLocalSurgeryDiagnosisCard}"
+                                oncomplete="PF('surgeryDiagnosisDialog').show()"
+                                process="@this"
+                                update="surgeryDiagnosisPanel">
+                            </p:commandButton>
+
                         </div>
                     </div>
                     <div class="row" >
@@ -600,21 +623,96 @@
                                         value="#{inpatientClinicalDataController.selectedDiagnosisCard.comments}">
                                     </p:textEditor>
                                     
-
-
-
+                                    <!-- Diagnosis Card Types Section -->
+                                    <div class="card m-2 p-2">
+                                        <div class="card-header">
+                                            <h:outputLabel value="System-Based Diagnosis Cards" />
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <p:commandButton 
+                                                        value="Ward Admission Diagnosis Card" 
+                                                        ajax="true" 
+                                                        icon="pi pi-document"
+                                                        styleClass="ui-button-success w-100"
+                                                        action="#{inpatientClinicalDataController.loadWardAdmissionDiagnosisCard}"
+                                                        oncomplete="PF('wardDiagnosisDialog').show()"
+                                                        process="@this"
+                                                        update="wardDiagnosisPanel">
+                                                    </p:commandButton>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <p:commandButton 
+                                                        value="Local Surgery Diagnosis Card" 
+                                                        ajax="true" 
+                                                        icon="pi pi-document"
+                                                        styleClass="ui-button-info w-100"
+                                                        action="#{inpatientClinicalDataController.loadLocalSurgeryDiagnosisCard}"
+                                                        oncomplete="PF('surgeryDiagnosisDialog').show()"
+                                                        process="@this"
+                                                        update="surgeryDiagnosisPanel">
+                                                    </p:commandButton>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
 
                                 </p:tab>
                             </p:tabView>
                         </div>
                     </div>
 
-
-
-                </h:form>
-
-            </ui:define>
-        </ui:composition>
-
-    </h:body>
-</html>
+                    <!-- Ward Admission Diagnosis Card Dialog -->
+                    <p:dialog id="wardDiagnosisDlg" widgetVar="wardDiagnosisDialog" modal="true" width="90%" height="90%" header="Ward Admission Diagnosis Card">
+                        <h:panelGroup id="wardDiagnosisPanel">
+                            <div class="card">
+                                <div class="card-body">
+                                    <h:outputText value="#{inpatientClinicalDataController.wardAdmissionDiagnosisCardHtml}" escape="false" rendered="#{inpatientClinicalDataController.wardAdmissionDiagnosisCardHtml ne null}"/>
+                                </div>
+                                <div class="card-footer">
+                                    <p:commandButton 
+                                        value="Print" 
+                                        ajax="true" 
+                                        icon="pi pi-print"
+                                        styleClass="ui-button-success">
+                                        <p:printer target="wardDiagnosisPanel" />
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        value="Close" 
+                                        ajax="true" 
+                                        icon="pi pi-times"
+                                        oncomplete="PF('wardDiagnosisDialog').hide()"
+                                        styleClass="ui-button-secondary">
+                                    </p:commandButton>
+                                </div>
+                            </div>
+                        </h:panelGroup>
+                    </p:dialog>
+
+                    <!-- Local Surgery Diagnosis Card Dialog -->
+                    <p:dialog id="surgeryDiagnosisDlg" widgetVar="surgeryDiagnosisDialog" modal="true" width="90%" height="90%" header="Local Surgery Diagnosis Card">
+                        <h:panelGroup id="surgeryDiagnosisPanel">
+                            <div class="card">
+                                <div class="card-body">
+                                    <h:outputText value="#{inpatientClinicalDataController.localSurgeryDiagnosisCardHtml}" escape="false" rendered="#{inpatientClinicalDataController.localSurgeryDiagnosisCardHtml ne null}"/>
+                                </div>
+                                <div class="card-footer">
+                                    <p:commandButton 
+                                        value="Print" 
+                                        ajax="true" 
+                                        icon="pi pi-print"
+                                        styleClass="ui-button-success">
+                                        <p:printer target="surgeryDiagnosisPanel" />
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        value="Close" 
+                                        ajax="true" 
+                                        icon="pi pi-times"
+                                        oncomplete="PF('surgeryDiagnosisDialog').hide()"
+                                        styleClass="ui-button-secondary">
+                                    </p:commandButton>
+                                </div>
+                            </div>
+                        </h:panelGroup>
+                    </p:dialog>