diff --git a/.github/last_date.txt b/.github/last_date.txt
index 6c93b259fd..83e0fd5a4a 100644
--- a/.github/last_date.txt
+++ b/.github/last_date.txt
@@ -1 +1 @@
-20240720
+20240720
\ No newline at end of file
diff --git a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
index d820e98a81..c598ac84c5 100644
--- a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
+++ b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
@@ -21,6 +21,8 @@
 import com.divudi.data.FinancialReport;
 import com.divudi.data.PaymentMethod;
 import com.divudi.data.PaymentMethodValues;
+import com.divudi.data.ReportTemplateRow;
+import com.divudi.data.ReportTemplateRowBundle;
 import com.divudi.entity.WebUser;
 import com.divudi.java.CommonFunctions;
 import javax.inject.Named;
@@ -31,6 +33,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.ejb.EJB;
 import javax.inject.Inject;
 import javax.persistence.TemporalType;
@@ -127,6 +130,11 @@ public class FinancialTransactionController implements Serializable {
     private Date fromDate;
     private Date toDate;
 
+    private Date fromDate;
+    private Date toDate;
+
+    private ReportTemplateRowBundle paymentSummaryBundle;
+
     // </editor-fold>  
     // <editor-fold defaultstate="collapsed" desc="Constructors">
     public FinancialTransactionController() {
@@ -568,6 +576,83 @@ public String navigateToCreateShiftEndSummaryBill() {
         return "/cashier/shift_end_summery_bill?faces-redirect=true";
     }
 
+    public String navigateToDayEndSummary() {
+        return "/analytics/day_end_summery?faces-redirect=true";
+    }
+
+    public void processDayEndSummary() {
+        System.out.println("processDayEndSummary");
+        resetClassVariables();
+        fillPaymentsForDateRange();
+        createPaymentSummery();
+
+    }
+
+    private void createPaymentSummery() {
+        System.out.println("createPaymentSummery");
+        System.out.println("paymentsFromShiftSratToNow = " + paymentsFromShiftSratToNow);
+
+        if (paymentsFromShiftSratToNow == null) {
+            return;
+        }
+
+        paymentSummaryBundle = new ReportTemplateRowBundle();
+        Map<String, Double> aggregatedPayments = new HashMap<>();
+        Map<String, ReportTemplateRow> keyMap = new HashMap<>();
+
+        for (Payment p : paymentsFromShiftSratToNow) {
+            System.out.println("p = " + p);
+
+            if (p == null || p.getBill() == null) {
+                continue; // Skip this iteration if p or p.getBill() is null
+            }
+
+            ReportTemplateRow row = new ReportTemplateRow();
+
+            if (p.getBill().getCategory() != null) {
+                row.setCategory(p.getBill().getCategory());
+            }
+
+            if (p.getBill().getBillTypeAtomic() != null) {
+                row.setBillTypeAtomic(p.getBill().getBillTypeAtomic());
+
+                if (p.getBill().getBillTypeAtomic().getServiceType() != null) {
+                    row.setServiceType(p.getBill().getBillTypeAtomic().getServiceType());
+                }
+            }
+
+            if (p.getBill().getCreditCompany() != null) {
+                row.setCreditCompany(p.getBill().getCreditCompany());
+            }
+
+            if (p.getBill().getToDepartment() != null) {
+                row.setToDepartment(p.getBill().getToDepartment());
+            }
+
+            row.setRowValue(p.getPaidValue());
+
+            String keyString = row.getCustomKey();
+
+            if (keyString != null) {
+                keyMap.putIfAbsent(keyString, row);
+                aggregatedPayments.merge(keyString, p.getPaidValue(), Double::sum);
+            }
+        }
+
+        List<ReportTemplateRow> rows = aggregatedPayments.entrySet().stream().map(entry -> {
+            ReportTemplateRow row = keyMap.get(entry.getKey());
+
+            if (row != null) {
+                row.setRowValue(entry.getValue());
+            }
+
+            return row;
+        }).collect(Collectors.toList());
+
+        if (paymentSummaryBundle != null) {
+            paymentSummaryBundle.getReportTemplateRows().addAll(rows);
+        }
+
     public String navigateToViewEndOfSelectedShiftStartSummaryBill(Bill startBill) {
         resetClassVariables();
         if (startBill == null) {
@@ -1494,7 +1579,7 @@ public void setFinancialReportByPayments(FinancialReport financialReportByPaymen
 
     public Date getFromDate() {
         if (fromDate == null) {
-            fromDate = CommonFunctions.getStartOfDay();
+            fromDate = CommonFunctions.getStartOfDay(new Date());
         }
         return fromDate;
     }
@@ -1505,7 +1590,7 @@ public void setFromDate(Date fromDate) {
 
     public Date getToDate() {
         if (toDate == null) {
-            toDate = CommonFunctions.getEndOfDay();
+            toDate = CommonFunctions.getEndOfDay(toDate);
         }
         return toDate;
     }
@@ -1514,12 +1599,23 @@ public void setToDate(Date toDate) {
         this.toDate = toDate;
     }
 
+    public ReportTemplateRowBundle getPaymentSummaryBundle() {
+        if (paymentSummaryBundle == null) {
+            paymentSummaryBundle = new ReportTemplateRowBundle();
+        }
+        return paymentSummaryBundle;
+    }
+
+    public void setPaymentSummaryBundle(ReportTemplateRowBundle paymentSummaryBundle) {
+        this.paymentSummaryBundle = paymentSummaryBundle;
+
     public List<Bill> getShiaftStartBills() {
         return shiaftStartBills;
     }
 
     public void setShiaftStartBills(List<Bill> shiaftStartBills) {
         this.shiaftStartBills = shiaftStartBills;
+
     }
 
 }
diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java
index ce88d159ed..6c8a4153dc 100644
--- a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java
+++ b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java
@@ -333,6 +333,12 @@ public class BookingControllerViewScope implements Serializable, ControllerWithP
     private String encryptedBillSessionId;
     private String encryptedExpiary;
 
+    private boolean listOngoing;
+    private boolean listPending;
+    private boolean listCancelled;
+    private boolean listCompleted;
+    private boolean listAll;
+
     public void sessionReschedule() {
         if (getSelectedSessionInstanceForRechedule() == null) {
             JsfUtil.addErrorMessage("Pleace Select Session For Rechedule");
@@ -1036,6 +1042,182 @@ public void addMonth() {
         filterSessionInstances();
     }
 
+    public void addMonthNew() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getFromDate());
+        cal.add(Calendar.MONTH, 1);
+        toDate = cal.getTime();
+        listAndFilterSessionInstances();
+    }
+
+    public void addSingleDateToToDateNew() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getFromDate());
+        cal.add(Calendar.DATE, 1);
+        toDate = cal.getTime();
+        listAndFilterSessionInstances();
+    }
+
+    public void addToDayToToDateNew() {
+        toDate = new Date();
+        listAndFilterSessionInstances();
+    }
+
+    public void filterSessionInstancesNew() {
+        sessionInstancesFiltered = new ArrayList<>();
+        if (sessionInstanceFilter == null) {
+            return;
+        }
+        if (sessionInstanceFilter.trim().equals("")) {
+            return;
+        }
+        if (sessionInstanceFilter.length() < 4) {
+            return;
+        }
+        listAndFilterSessionInstances();
+    }
+
+    public void addTwoDaysNew() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getFromDate());
+        cal.add(Calendar.DATE, 2);
+        toDate = cal.getTime();
+        listAndFilterSessionInstances();
+    }
+
+    public void addSevenDaysNew() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getFromDate());
+        cal.add(Calendar.DATE, 7);
+        toDate = cal.getTime();
+        listAndFilterSessionInstances();
+    }
+
+    public void listAll() {
+        listAll = true;
+        listPending = false;
+        listCancelled = false;
+        listOngoing = false;
+        listCompleted = false;
+        listAndFilterSessionInstances();
+
+    }
+
+    public void listPending() {
+        listAll = false;
+        listPending = true;
+        listCancelled = false;
+        listOngoing = false;
+        listCompleted = false;
+        listAndFilterSessionInstances();
+    }
+
+    public void listOngoing() {
+        listAll = false;
+        listPending = false;
+        listCancelled = false;
+        listOngoing = true;
+        listCompleted = false;
+        listAndFilterSessionInstances();
+    }
+
+    public void listCompleted() {
+        listAll = false;
+        listPending = false;
+        listCancelled = false;
+        listOngoing = false;
+        listCompleted = true;
+        listAndFilterSessionInstances();
+    }
+
+    public void addBillSessionData() {
+        if (configOptionApplicationController.getBooleanValueByKey("Calculate All Patient Count When Loading Channel Booking By Dates")) {
+            if (sessionInstances != null) {
+                if (sessionInstances.size() < 21) {
+                    for (SessionInstance s : sessionInstances) {
+                        fillBillSessions(s);
+                    }
+                }
+            }
+        }
+    }
+
+    public void listAndFilterSessionInstances() {
+        loadSessionInstances();
+        addBillSessionData();
+    }
+
+    public void loadSessionInstances() {
+        sessionInstancesFiltered = new ArrayList<>();
+        StringBuilder jpql = new StringBuilder("select i from SessionInstance i where i.retired=:ret and i.originatingSession.retired=:ret");
+
+        // Initializing the parameters map
+        Map<String, Object> params = new HashMap<>();
+        params.put("ret", false);
+
+        // Adding date conditions
+        if (fromDate != null && toDate != null) {
+            jpql.append(" and i.sessionDate between :fromDate and :toDate");
+            params.put("fromDate", fromDate);
+            params.put("toDate", toDate);
+        } else if (fromDate != null) {
+            jpql.append(" and i.sessionDate >= :fromDate");
+            params.put("fromDate", fromDate);
+        } else if (toDate != null) {
+            jpql.append(" and i.sessionDate <= :toDate");
+            params.put("toDate", toDate);
+        } else {
+            jpql.append(" and i.sessionDate = :sd");
+            params.put("sd", new Date());
+        }
+
+        // Dynamically appending conditions based on parameters
+        List<String> conditions = new ArrayList<>();
+        if (listOngoing) {
+            conditions.add("(i.started = true and i.completed = false)");
+        }
+        if (listCompleted) {
+            conditions.add("i.completed = true");
+        }
+        if (listPending) {
+            conditions.add("(i.started = false and i.completed = false)");
+        }
+        if (listCancelled) {
+            conditions.add("i.cancelled = true");
+        }
+
+        // Adding the conditions to the JPQL query
+        if (!conditions.isEmpty()) {
+            jpql.append(" and (").append(String.join(" or ", conditions)).append(")");
+        }
+
+        // Adding string filter conditions
+        if (sessionInstanceFilter != null && !sessionInstanceFilter.trim().isEmpty()) {
+            String[] filterKeywords = sessionInstanceFilter.trim().toLowerCase().split("\\s+");
+            List<String> filterConditions = new ArrayList<>();
+            for (String keyword : filterKeywords) {
+                filterConditions.add("(lower(i.originatingSession.name) like :keyword"
+                        + " or lower(i.originatingSession.staff.person.name) like :keyword"
+                        + " or lower(i.originatingSession.staff.speciality.name) like :keyword)");
+            }
+            jpql.append(" and (").append(String.join(" or ", filterConditions)).append(")");
+            params.put("keyword", "%" + sessionInstanceFilter.trim().toLowerCase() + "%");
+        }
+
+        // Adding sorting to JPQL
+        jpql.append(" order by i.sessionDate, i.originatingSession.name");
+
+        Long numberOfSessionToLoad = configOptionApplicationController.getLongValueByKey("Maximum Number of Sessions to Load during channel booking by dates page.", 30L);
+
+        sessionInstancesFiltered = sessionInstanceFacade.findByJpql(jpql.toString(), params, TemporalType.DATE, numberOfSessionToLoad.intValue());
+
+        // Select the first item if the filtered list is not empty
+        if (!sessionInstancesFiltered.isEmpty()) {
+            selectedSessionInstance = sessionInstancesFiltered.get(0);
+            sessionInstanceSelected();
+        }
+    }
+
     public void filterSessionInstances() {
         if (sessionInstanceFilter == null || sessionInstanceFilter.trim().isEmpty()) {
             if (sessionInstances != null) {
@@ -1425,6 +1607,41 @@ public String navigateToChannelBookingFromMenuByDate() {
 
     }
 
+    public String navigateToChannelBookingFromMenuByDateNew() {
+        Boolean opdBillingAfterShiftStart = sessionController.getApplicationPreference().isOpdBillingAftershiftStart();
+
+        viewScopeDataTransferController.setFromDate(fromDate);
+        viewScopeDataTransferController.setToDate(toDate);
+
+        viewScopeDataTransferController.setNeedToFillBillSessions(false);
+        viewScopeDataTransferController.setNeedToFillBillSessionDetails(false);
+        viewScopeDataTransferController.setNeedToFillSessionInstances(true);
+        viewScopeDataTransferController.setNeedToFillSessionInstanceDetails(true);
+        viewScopeDataTransferController.setNeedToFillMembershipDetails(false);
+        viewScopeDataTransferController.setNeedToPrepareForNewBooking(true);
+
+        if (opdBillingAfterShiftStart) {
+            financialTransactionController.findNonClosedShiftStartFundBillIsAvailable();
+            if (financialTransactionController.getNonClosedShiftStartFundBill() != null) {
+                fromDate = new Date();
+                toDate = new Date();
+                listAndFilterSessionInstances();
+                prepareForNewChannellingBill();
+                return "/channel/channel_booking_by_date?faces-redirect=true";
+            } else {
+                JsfUtil.addErrorMessage("Start Your Shift First !");
+                return "/cashier/index?faces-redirect=true";
+            }
+        } else {
+            fromDate = new Date();
+            toDate = new Date();
+            listAndFilterSessionInstances();
+            prepareForNewChannellingBill();
+            return "/channel/channel_booking_by_date?faces-redirect=true";
+        }
+
+    }
+
     public String navigateToChannelBookingFromMembershipByDate(Patient pt, PaymentScheme ps) {
 
         if (pt == null) {
@@ -7805,4 +8022,44 @@ public void setEncryptedExpiary(String encryptedExpiary) {
         this.encryptedExpiary = encryptedExpiary;
     }
 
+    public boolean isListOngoing() {
+        return listOngoing;
+    }
+
+    public void setListOngoing(boolean listOngoing) {
+        this.listOngoing = listOngoing;
+    }
+
+    public boolean isListPending() {
+        return listPending;
+    }
+
+    public void setListPending(boolean listPending) {
+        this.listPending = listPending;
+    }
+
+    public boolean isListCancelled() {
+        return listCancelled;
+    }
+
+    public void setListCancelled(boolean listCancelled) {
+        this.listCancelled = listCancelled;
+    }
+
+    public boolean isListCompleted() {
+        return listCompleted;
+    }
+
+    public void setListCompleted(boolean listCompleted) {
+        this.listCompleted = listCompleted;
+    }
+
+    public boolean isListAll() {
+        return listAll;
+    }
+
+    public void setListAll(boolean listAll) {
+        this.listAll = listAll;
+    }
+
 }
diff --git a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java
index 934c1feb39..3673947dad 100644
--- a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java
+++ b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java
@@ -40,6 +40,7 @@
 import javax.faces.convert.FacesConverter;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.persistence.TemporalType;
 
 /**
  *
@@ -72,6 +73,7 @@ public class ReportTemplateController implements Serializable {
     private Date fromDate;
     private Date toDate;
     private Institution institution;
+    private Institution creditCompany;
     private Department department;
     private Institution fromInstitution;
     private Department fromDepartment;
@@ -79,7 +81,7 @@ public class ReportTemplateController implements Serializable {
     private Department toDepartment;
     private WebUser user;
     private Staff staff;
-    
+
     private List<ReportTemplateRow> ReportTemplateRows;
     private ReportTemplateRowBundle reportTemplateRowBundle;
 
@@ -160,6 +162,9 @@ public String processReport() {
             case BILLT_TYPE_AND_PAYMENT_METHOD_SUMMARY_USING_BILLS:
                 handleBillTypeAndPaymentMethodSummaryUsingBills();
                 break;
+            case BILL_TYPE_ATOMIC_SUMMARY_USING_FEES:
+                handleBillFeeGroupedByBillTypeAtomic();
+                break;
             case BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY:
                 handleBillFeeGroupedByToDepartmentAndCategory();
                 break;
@@ -196,6 +201,24 @@ public String processReport() {
             case PAYMENT_TYPE_SUMMARY_USING_BILLS:
                 handlePaymentTypeSummaryUsingBills();
                 break;
+            case ITEM_CATEGORY_SUMMARY_BY_BILL_FEE:
+                handleItemCategorySummaryByBillFee();
+                break;
+            case ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM:
+                handleItemCategorySummaryByBillItem();
+                break;
+            case ITEM_CATEGORY_SUMMARY_BY_BILL:
+                handleItemCategorySummaryByBill();
+                break;
+            case TO_DEPARTMENT_SUMMARY_BY_BILL_FEE:
+                handleToDepartmentSummaryByBillFee();
+                break;
+            case TO_DEPARTMENT_SUMMARY_BY_BILL_ITEM:
+                handleToDepartmentSummaryByBillItem();
+                break;
+            case TO_DEPARTMENT_SUMMARY_BY_BILL:
+                handleToDepartmentSummaryByBill();
+                break;
             default:
                 JsfUtil.addErrorMessage("Unknown Report Type");
                 return "";
@@ -211,67 +234,151 @@ private void handleBillTypeAndPaymentMethodSummaryUsingBills() {
         // Method implementation here
     }
 
-    private void handleBillFeeGroupedByToDepartmentAndCategory() {
+    private void handleBillFeeGroupedByBillTypeAtomic() {
         String jpql;
         Map<String, Object> parameters = new HashMap<>();
+        reportTemplateRowBundle = new ReportTemplateRowBundle();
 
-        jpql = "select new com.divudi.data.ReportTemplateRow(bf.bill.billTypeAtomic, bf.bill.category.name, bf.bill.toDepartment.name, sum(bf.fee)) "
+        jpql = "select new com.divudi.data.ReportTemplateRow("
+                + " bill.billTypeAtomic, sum(bf.feeValue)) "
                 + " from BillFee bf "
-                + " where bf.retired=:bfr "
-                + " and bf.billItem.retired=:bir "
-                + " and bf.bill.retired=:br "
-                + " and bf.bill.billTypeAtomic in :btas ";
+                + " join bf.bill bill "
+                + " where bf.retired<>:bfr "
+                + " and bf.billItem.retired<>:bir "
+                + " and bill.retired<>:br ";
+        parameters.put("bfr", true);
+        parameters.put("bir", true);
+        parameters.put("br", true);
+
+        if (current.getBillTypeAtomics() != null) {
+            jpql += " and bill.billTypeAtomic in :btas ";
+            parameters.put("btas", current.getBillTypeAtomics());
+        }
 
-        boolean testing = true;
-        if (!testing) {
-            BillFee bf = new BillFee();
-            bf.getBill().getBillTypeAtomic(); // Enum
-            bf.getBill().getCategory().getName(); // String
-            bf.getBill().getToDepartment().getName(); // String
-            bf.getFeeValue(); // double
+        for (ReportTemplateFilter f : current.getReportFilters()) {
+            switch (f) {
+                case DATE:
+                    jpql += " and bill.billDate=:bd ";
+                    parameters.put("bd", date);
+                    break;
+                case TO_DATE:
+                    jpql += " and bill.billDate < :td ";
+                    parameters.put("td", toDate);
+                    break;
+                case FROM_DATE:
+                    jpql += " and bill.billDate > :fd ";
+                    parameters.put("fd", fromDate);
+                    break;
+                case INSTITUTION:
+                    jpql += " and bill.institution=:ins ";
+                    parameters.put("ins", institution);
+                    break;
+                case DEPARTMENT:
+                    jpql += " and bill.department=:dep ";
+                    parameters.put("dep", department);
+                    break;
+                case FROM_INSTITUTION:
+                    jpql += " and bill.fromInstitution=:fins ";
+                    parameters.put("fins", fromInstitution);
+                    break;
+                case FROM_DEPARTMENT:
+                    jpql += " and bill.fromDepartment=:fdep ";
+                    parameters.put("fdep", fromDepartment);
+                    break;
+                case TO_INSTITUTION:
+                    jpql += " and bill.toInstitution=:tins ";
+                    parameters.put("tins", toInstitution);
+                    break;
+                case TO_DEPARTMENT:
+                    jpql += " and bill.toDepartment=:tdep ";
+                    parameters.put("tdep", toDepartment);
+                    break;
+                case CREDIT_COMPANY:
+                    jpql += " and bill.creditCompany=:creditCompany ";
+                    parameters.put("creditCompany", creditCompany);
+                    break;
+                default:
+                    throw new AssertionError();
+            }
         }
 
+        jpql += " group by bill.billTypeAtomic";
+
+        System.out.println("jpql = " + jpql);
+        System.out.println("parameters = " + parameters);
+
+        List<ReportTemplateRow> rs = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.DATE);
+
+        if (rs == null || rs.isEmpty()) {
+            System.out.println("No results found.");
+        } else {
+            System.out.println("Results found: " + rs.size());
+        }
+
+        long idCounter = 1;
+        for (ReportTemplateRow row : rs) {
+            row.setId(idCounter++);
+        }
+        reportTemplateRowBundle.setReportTemplateRows(rs);
+    }
+
+    private void handleBillFeeGroupedByToDepartmentAndCategory() {
+        String jpql;
+        Map<String, Object> parameters = new HashMap<>();
+        reportTemplateRowBundle = new ReportTemplateRowBundle();
+
+        jpql = "select new com.divudi.data.ReportTemplateRow("
+                + " bill.billTypeAtomic, sum(bf.feeValue)) "
+                + " from BillFee bf "
+                + " join bf.bill bill "
+                + " where bf.retired<>:bfr "
+                + " and bf.billItem.retired<>:bir "
+                + " and bill.retired<>:br ";
+        parameters.put("bfr", true);
+        parameters.put("bir", true);
+        parameters.put("br", true);
+
         if (current.getBillTypeAtomics() != null) {
-            jpql += " and bf.bill.billTypeAtomic in :btas ";
+            jpql += " and bill.billTypeAtomic in :btas ";
             parameters.put("btas", current.getBillTypeAtomics());
         }
 
         for (ReportTemplateFilter f : current.getReportFilters()) {
             switch (f) {
                 case DATE:
-                    jpql += " and bf.bill.billDate=:bd ";
+                    jpql += " and bill.billDate=:bd ";
                     parameters.put("bd", date);
                     break;
                 case TO_DATE:
-                    jpql += " and bf.bill.billDate < :td ";
+                    jpql += " and bill.billDate < :td ";
                     parameters.put("td", toDate);
                     break;
                 case FROM_DATE:
-                    jpql += " and bf.bill.billDate > :fd ";
+                    jpql += " and bill.billDate > :fd ";
                     parameters.put("fd", fromDate);
                     break;
                 case INSTITUTION:
-                    jpql += " and bf.bill.institution=:ins ";
+                    jpql += " and bill.institution=:ins ";
                     parameters.put("ins", institution);
                     break;
                 case DEPARTMENT:
-                    jpql += " and bf.bill.department=:dep ";
+                    jpql += " and bill.department=:dep ";
                     parameters.put("dep", department);
                     break;
                 case FROM_INSTITUTION:
-                    jpql += " and bf.bill.fromInstitution=:fins ";
+                    jpql += " and bill.fromInstitution=:fins ";
                     parameters.put("fins", fromInstitution);
                     break;
                 case FROM_DEPARTMENT:
-                    jpql += " and bf.bill.fromDepartment=:fdep ";
+                    jpql += " and bill.fromDepartment=:fdep ";
                     parameters.put("fdep", fromDepartment);
                     break;
                 case TO_INSTITUTION:
-                    jpql += " and bf.bill.toInstitution=:tins ";
+                    jpql += " and bill.toInstitution=:tins ";
                     parameters.put("tins", toInstitution);
                     break;
                 case TO_DEPARTMENT:
-                    jpql += " and bf.bill.toDepartment=:tdep ";
+                    jpql += " and bill.toDepartment=:tdep ";
                     parameters.put("tdep", toDepartment);
                     break;
                 default:
@@ -279,7 +386,24 @@ private void handleBillFeeGroupedByToDepartmentAndCategory() {
             }
         }
 
-        // Add the code to execute the JPQL query using the parameters map
+        jpql += " group by bill.billTypeAtomic";
+
+        System.out.println("jpql = " + jpql);
+        System.out.println("parameters = " + parameters);
+
+        List<ReportTemplateRow> rs = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.DATE);
+
+        if (rs == null || rs.isEmpty()) {
+            System.out.println("No results found.");
+        } else {
+            System.out.println("Results found: " + rs.size());
+        }
+
+        long idCounter = 1;
+        for (ReportTemplateRow row : rs) {
+            row.setId(idCounter++);
+        }
+        reportTemplateRowBundle.setReportTemplateRows(rs);
     }
 
     private void handleBillFeeList() {
@@ -295,7 +419,87 @@ private void handleBillList() {
     }
 
     private void handleBillTypeAtomicSummaryUsingBills() {
-        // Method implementation here
+        String jpql;
+        Map<String, Object> parameters = new HashMap<>();
+        reportTemplateRowBundle = new ReportTemplateRowBundle();
+
+        jpql = "select new com.divudi.data.ReportTemplateRow("
+                + " bill.billTypeAtomic, sum(bill.netTotal)) "
+                + " from Bill bill "
+                + " where bill.retired<>:br ";
+        parameters.put("br", true);
+
+        if (current.getBillTypeAtomics() != null) {
+            jpql += " and bill.billTypeAtomic in :btas ";
+            parameters.put("btas", current.getBillTypeAtomics());
+        }
+
+        for (ReportTemplateFilter f : current.getReportFilters()) {
+            switch (f) {
+                case DATE:
+                    jpql += " and bill.billDate=:bd ";
+                    parameters.put("bd", date);
+                    break;
+                case TO_DATE:
+                    jpql += " and bill.billDate < :td ";
+                    parameters.put("td", toDate);
+                    break;
+                case FROM_DATE:
+                    jpql += " and bill.billDate > :fd ";
+                    parameters.put("fd", fromDate);
+                    break;
+                case INSTITUTION:
+                    jpql += " and bill.institution=:ins ";
+                    parameters.put("ins", institution);
+                    break;
+                case DEPARTMENT:
+                    jpql += " and bill.department=:dep ";
+                    parameters.put("dep", department);
+                    break;
+                case FROM_INSTITUTION:
+                    jpql += " and bill.fromInstitution=:fins ";
+                    parameters.put("fins", fromInstitution);
+                    break;
+                case FROM_DEPARTMENT:
+                    jpql += " and bill.fromDepartment=:fdep ";
+                    parameters.put("fdep", fromDepartment);
+                    break;
+                case TO_INSTITUTION:
+                    jpql += " and bill.toInstitution=:tins ";
+                    parameters.put("tins", toInstitution);
+                    break;
+                case TO_DEPARTMENT:
+                    jpql += " and bill.toDepartment=:tdep ";
+                    parameters.put("tdep", toDepartment);
+                    break;
+                case CREDIT_COMPANY:
+                    jpql += " and bill.creditCompany=:creditCompany ";
+                    parameters.put("creditCompany", creditCompany);
+                    break;
+                default:
+                    throw new AssertionError();
+            }
+        }
+
+        jpql += " group by bill.billTypeAtomic";
+
+        System.out.println("jpql = " + jpql);
+        System.out.println("parameters = " + parameters);
+
+        List<ReportTemplateRow> rs = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.DATE);
+
+        if (rs == null || rs.isEmpty()) {
+            System.out.println("No results found.");
+        } else {
+            System.out.println("Results found: " + rs.size());
+        }
+
+        long idCounter = 1;
+        for (ReportTemplateRow row : rs) {
+            row.setId(idCounter++);
+        }
+        reportTemplateRowBundle.setReportTemplateRows(rs);
+
     }
 
     private void handleBillTypeAtomicSummaryUsingPayments() {
@@ -618,11 +822,128 @@ public ReportTemplateRowBundle getReportTemplateRowBundle() {
     public void setReportTemplateRowBundle(ReportTemplateRowBundle reportTemplateRowBundle) {
         this.reportTemplateRowBundle = reportTemplateRowBundle;
     }
-    
+
+    public Institution getCreditCompany() {
+        return creditCompany;
+    }
+
+    public void setCreditCompany(Institution creditCompany) {
+        this.creditCompany = creditCompany;
+    }
+
+
     /**
      *
      */
-    @FacesConverter(forClass = ReportTemplate.class)
+    private void handleItemCategorySummaryByBillFee() {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+    private void handleItemCategorySummaryByBillItem() {
+        String jpql;
+        Map<String, Object> parameters = new HashMap<>();
+        reportTemplateRowBundle = new ReportTemplateRowBundle();
+
+        jpql = "select new com.divudi.data.ReportTemplateRow("
+                + " bi.item.category.name, sum(bi.netValue)) "
+                + " from BillItem bi"
+                + " join bi.bill bill "
+                + " where bill.retired<>:br "
+                + " and bi.retired<>:br ";
+        parameters.put("br", true);
+
+        if (current.getBillTypeAtomics() != null) {
+            jpql += " and bill.billTypeAtomic in :btas ";
+            parameters.put("btas", current.getBillTypeAtomics());
+        }
+
+        for (ReportTemplateFilter f : current.getReportFilters()) {
+            switch (f) {
+                case DATE:
+                    jpql += " and bill.billDate=:bd ";
+                    parameters.put("bd", date);
+                    break;
+                case TO_DATE:
+                    jpql += " and bill.billDate < :td ";
+                    parameters.put("td", toDate);
+                    break;
+                case FROM_DATE:
+                    jpql += " and bill.billDate > :fd ";
+                    parameters.put("fd", fromDate);
+                    break;
+                case INSTITUTION:
+                    jpql += " and bill.institution=:ins ";
+                    parameters.put("ins", institution);
+                    break;
+                case DEPARTMENT:
+                    jpql += " and bill.department=:dep ";
+                    parameters.put("dep", department);
+                    break;
+                case FROM_INSTITUTION:
+                    jpql += " and bill.fromInstitution=:fins ";
+                    parameters.put("fins", fromInstitution);
+                    break;
+                case FROM_DEPARTMENT:
+                    jpql += " and bill.fromDepartment=:fdep ";
+                    parameters.put("fdep", fromDepartment);
+                    break;
+                case TO_INSTITUTION:
+                    jpql += " and bill.toInstitution=:tins ";
+                    parameters.put("tins", toInstitution);
+                    break;
+                case TO_DEPARTMENT:
+                    jpql += " and bill.toDepartment=:tdep ";
+                    parameters.put("tdep", toDepartment);
+                    break;
+                case CREDIT_COMPANY:
+                    jpql += " and bill.creditCompany=:creditCompany ";
+                    parameters.put("creditCompany", creditCompany);
+                    break;
+                default:
+                    throw new AssertionError();
+            }
+        }
+
+        jpql += " and bi.item is not null "
+                + " and bi.item.category is not null ";
+        
+        jpql += " group by bi.item.category ";
+
+        System.out.println("jpql = " + jpql);
+        System.out.println("parameters = " + parameters);
+
+        List<ReportTemplateRow> rs = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.DATE);
+
+        if (rs == null || rs.isEmpty()) {
+            System.out.println("No results found.");
+        } else {
+            System.out.println("Results found: " + rs.size());
+        }
+
+        long idCounter = 1;
+        for (ReportTemplateRow row : rs) {
+            row.setId(idCounter++);
+        }
+        reportTemplateRowBundle.setReportTemplateRows(rs);
+    }
+
+    private void handleItemCategorySummaryByBill() {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+    private void handleToDepartmentSummaryByBillFee() {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+    private void handleToDepartmentSummaryByBillItem() {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+    private void handleToDepartmentSummaryByBill() {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+ 
     public static class ReportTemplateConverter implements Converter {
 
         @Override
diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java
index e89d52bc8d..4f38fc9c6e 100644
--- a/src/main/java/com/divudi/bean/opd/OpdBillController.java
+++ b/src/main/java/com/divudi/bean/opd/OpdBillController.java
@@ -294,6 +294,7 @@ public class OpdBillController implements Serializable, ControllerWithPatient, C
     private Double totalSaffFee;
     private boolean canChangeSpecialityAndDoctorInAddedBillItem;
     private String localNumber;
+
     /**
      *
      * Navigation Methods
@@ -831,7 +832,7 @@ public void changeBillDoctorByFee(BillFee bf) {
         getCurrentlyWorkingStaff().add(bf.getStaff());
         selectedCurrentlyWorkingStaff = bf.getStaff();
     }
-    
+
     public void changeBillDoctorByReferral() {
         if (referredBy == null) {
             JsfUtil.addErrorMessage("No referring doctor");
@@ -1398,6 +1399,11 @@ public void setSessionDate(Date sessionDate) {
     }
 
     public boolean isForeigner() {
+        if (configOptionApplicationController.getBooleanValueByKey("Save the Patient with Patient Status")) {
+            if (patient != null) {
+                foreigner = patient.getPerson().isForeigner();
+            }
+        }
         return foreigner;
     }
 
@@ -2002,7 +2008,6 @@ private void saveBatchBill() {
         newBatchBill.setCreatedAt(new Date());
         newBatchBill.setCreater(getSessionController().getLoggedUser());
         newBatchBill.setFromStaff(selectedCurrentlyWorkingStaff);
-       
 
         getBillFacade().create(newBatchBill);
 
@@ -2091,9 +2096,9 @@ private Bill saveBill(Department bt, Bill newBill) {
         newBill.setBillDate(new Date());
         newBill.setBillTime(new Date());
         newBill.setPatient(patient);
-        
+
         if (localNumber != null) {
-             newBill.setLocalNumber(localNumber);
+            newBill.setLocalNumber(localNumber);
         }
 
 //        newBill.setMembershipScheme(membershipSchemeController.fetchPatientMembershipScheme(patient, getSessionController().getApplicationPreference().isMembershipExpires()));
diff --git a/src/main/java/com/divudi/data/ReportTemplateRow.java b/src/main/java/com/divudi/data/ReportTemplateRow.java
index 666232025b..965710e6d9 100644
--- a/src/main/java/com/divudi/data/ReportTemplateRow.java
+++ b/src/main/java/com/divudi/data/ReportTemplateRow.java
@@ -1,5 +1,9 @@
 package com.divudi.data;
 
+import com.divudi.entity.Category;
+import com.divudi.entity.Department;
+import com.divudi.entity.Institution;
+
 /**
  *
  * @author buddhika
@@ -15,9 +19,11 @@ public class ReportTemplateRow {
     private Long rowCount;
     private Long id;
 
-    public String getFeeName() {
-        return feeName;
-    }
+    private Category category;
+    private ServiceType serviceType;
+    private BillTypeAtomic billTypeAtomic;
+    private Institution creditCompany;
+    private Department toDepartment;
 
     public void setFeeName(String feeName) {
         this.feeName = feeName;
@@ -80,6 +86,28 @@ public ReportTemplateRow(String feeName, String categoryName, String toDepartmen
         this.rowValue = rowValue;
         this.rowCount = rowCount;
     }
+    
+    public ReportTemplateRow(String categoryName, Double rowValue) {
+        this.categoryName = categoryName;
+        this.rowValue = rowValue;
+    }
+    
+    public ReportTemplateRow(BillTypeAtomic billTypeAtomic, String categoryName, String toDepartmentName, Double rowValue) {
+        this.billTypeAtomic = billTypeAtomic;
+        this.categoryName = categoryName;
+        this.toDepartmentName = toDepartmentName;
+        this.rowValue = rowValue;
+    }
+
+    public ReportTemplateRow(BillTypeAtomic billTypeAtomic, Double rowValue) {
+        this.billTypeAtomic = billTypeAtomic;
+        this.rowValue = rowValue;
+    }
+
+    
+    public ReportTemplateRow(Double rowValue) {
+        this.rowValue = rowValue;
+    }
 
     public ReportTemplateRow() {
     }
@@ -92,6 +120,57 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    
-    
+    public Category getCategory() {
+        return category;
+    }
+
+    public void setCategory(Category category) {
+        this.category = category;
+    }
+
+    public ServiceType getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(ServiceType serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public Institution getCreditCompany() {
+        return creditCompany;
+    }
+
+    public void setCreditCompany(Institution creditCompany) {
+        this.creditCompany = creditCompany;
+    }
+
+    public Department getToDepartment() {
+        return toDepartment;
+    }
+
+    public void setToDepartment(Department toDepartment) {
+        this.toDepartment = toDepartment;
+    }
+
+    public BillTypeAtomic getBillTypeAtomic() {
+        return billTypeAtomic;
+    }
+
+    public void setBillTypeAtomic(BillTypeAtomic billTypeAtomic) {
+        this.billTypeAtomic = billTypeAtomic;
+    }
+
+    // Custom method to generate a unique key string, handling null values
+    public String getCustomKey() {
+        return (category != null ? category.getName() : "") + "|"
+                + (creditCompany != null ? creditCompany.getName() : "") + "|"
+                + (toDepartment != null ? toDepartment.getName() : "") + "|"
+                + (serviceType != null ? serviceType.getLabel() : "") + "|"
+                + (billTypeAtomic != null ? billTypeAtomic.getLabel() : "");
+    }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
 }
diff --git a/src/main/java/com/divudi/data/ReportTemplateRowBundle.java b/src/main/java/com/divudi/data/ReportTemplateRowBundle.java
index e69a02a0f2..5064db5b99 100644
--- a/src/main/java/com/divudi/data/ReportTemplateRowBundle.java
+++ b/src/main/java/com/divudi/data/ReportTemplateRowBundle.java
@@ -1,6 +1,7 @@
 package com.divudi.data;
 
 import com.divudi.entity.ReportTemplate;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -10,7 +11,7 @@
 public class ReportTemplateRowBundle {
 
     private ReportTemplate reportTemplate;
-    private List<ReportTemplateRowBundle> reportTemplateRowBundles;
+    private List<ReportTemplateRow> reportTemplateRows;
 
     public ReportTemplate getReportTemplate() {
         return reportTemplate;
@@ -20,13 +21,18 @@ public void setReportTemplate(ReportTemplate reportTemplate) {
         this.reportTemplate = reportTemplate;
     }
 
-    public List<ReportTemplateRowBundle> getReportTemplateRowBundles() {
-        return reportTemplateRowBundles;
+    public List<ReportTemplateRow> getReportTemplateRows() {
+        if(reportTemplateRows==null){
+            reportTemplateRows = new ArrayList<>();
+        }
+        return reportTemplateRows;
     }
 
-    public void setReportTemplateRowBundles(List<ReportTemplateRowBundle> reportTemplateRowBundles) {
-        this.reportTemplateRowBundles = reportTemplateRowBundles;
+    public void setReportTemplateRows(List<ReportTemplateRow> reportTemplateRows) {
+        this.reportTemplateRows = reportTemplateRows;
     }
+
+   
     
     
     
diff --git a/src/main/java/com/divudi/data/analytics/ReportTemplateFilter.java b/src/main/java/com/divudi/data/analytics/ReportTemplateFilter.java
index adb0712e74..7aa9349a97 100644
--- a/src/main/java/com/divudi/data/analytics/ReportTemplateFilter.java
+++ b/src/main/java/com/divudi/data/analytics/ReportTemplateFilter.java
@@ -11,12 +11,11 @@ public enum ReportTemplateFilter {
     INSTITUTION("Institution"),
 
     DEPARTMENT("Department"),
+    CREDIT_COMPANY("Credit Company"),
     FROM_INSTITUTION("From Institution"),
     FROM_DEPARTMENT("From Department"),
     TO_INSTITUTION("To Institution"),
-    TO_DEPARTMENT("To Department"),
-    
-    ;
+    TO_DEPARTMENT("To Department"),;
 
     private final String label;
 
diff --git a/src/main/java/com/divudi/data/analytics/ReportTemplateType.java b/src/main/java/com/divudi/data/analytics/ReportTemplateType.java
index 139a36d735..d52b6ceb15 100644
--- a/src/main/java/com/divudi/data/analytics/ReportTemplateType.java
+++ b/src/main/java/com/divudi/data/analytics/ReportTemplateType.java
@@ -15,10 +15,19 @@ public enum ReportTemplateType {
     BILLT_TYPE_AND_PAYMENT_METHOD_SUMMARY_USING_BILLS("Bill Type Summary by using Bills"),
     PAYMENT_TYPE_SUMMARY_USING_BILLS("Payment Method Summary by using Bills"),
     BILL_TYPE_ATOMIC_SUMMARY_USING_PAYMENTS("Bill Type Summary by using Payments"),
+    BILL_TYPE_ATOMIC_SUMMARY_USING_FEES("Bill Type Summary usinf Bill Fees"),
     BILLT_TYPE_AND_PAYMENT_METHOD_SUMMARY_PAYMENTS("Bill Type Summary by using Payments"),
     PAYMENT_METHOD_SUMMARY_USING_PAYMENTS("Bill Type Summary by using Payments"),
     PAYMENT_METHOD_SUMMARY_USING_BILLS("Bill Type Summary by using Payments"),
-    PAYMENT_TYPE_SUMMARY_PAYMENTS("Payment Method Summary by using Payments"),;
+    PAYMENT_TYPE_SUMMARY_PAYMENTS("Payment Method Summary by using Payments"),
+    ITEM_CATEGORY_SUMMARY_BY_BILL_FEE("Item Category Summary by Bill Fee"),
+    ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM("Item Category Summary by Bill Item"),
+    ITEM_CATEGORY_SUMMARY_BY_BILL("Item Category Summary by Bill"),
+    TO_DEPARTMENT_SUMMARY_BY_BILL_FEE("To Department Summary by Bill Fee"),
+    TO_DEPARTMENT_SUMMARY_BY_BILL_ITEM("To Department Summary by Bill Item"),
+    TO_DEPARTMENT_SUMMARY_BY_BILL("To Department Summary by Bill");
+
+    ;
 
     private final String label;
 
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 82d8488908..1b6f661a7c 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
-  <persistence-unit name="hmisPU" transaction-type="JTA">
-    <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-    <jta-data-source>jdbc/sethma</jta-data-source>
-    <exclude-unlisted-classes>false</exclude-unlisted-classes>
-    <properties>
-      <property name="eclipselink.logging.level.sql" value="SEVERE"/>
-      <property name="eclipselink.logging.parameters" value="false"/>
-      <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
-    </properties>
-  </persistence-unit>
-  <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-    <jta-data-source>jdbc/sethmaAudit</jta-data-source>
-    <class>com.divudi.entity.AuditEvent</class>
-    <exclude-unlisted-classes>true</exclude-unlisted-classes>
-    <properties>
-      <property name="eclipselink.logging.level.sql" value="SEVERE"/>
-      <property name="eclipselink.logging.parameters" value="false"/>
-      <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
-    </properties>
-  </persistence-unit>
+
+    <persistence-unit name="hmisPU" transaction-type="JTA">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <jta-data-source>jdbc/arogya</jta-data-source>
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+        <properties>
+            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+            <property name="eclipselink.logging.parameters" value="false"/>
+        </properties>
+    </persistence-unit>
+    <persistence-unit name="hmisAuditPU" transaction-type="JTA">
+        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
+        <class>com.divudi.entity.AuditEvent</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+            <property name="eclipselink.logging.parameters" value="false"/>
+        </properties>
+    </persistence-unit>
 </persistence>
diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
index 497b169fd2..9dc66492f8 100644
--- a/src/main/resources/VERSION.txt
+++ b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240720.2
+3.0.0.20240720.2
\ No newline at end of file
diff --git a/src/main/webapp/analytics/all_financial_transaction_summary_by_user.xhtml b/src/main/webapp/analytics/all_financial_transaction_summary_by_user.xhtml
index 693ed184e9..afa6f8da4d 100644
--- a/src/main/webapp/analytics/all_financial_transaction_summary_by_user.xhtml
+++ b/src/main/webapp/analytics/all_financial_transaction_summary_by_user.xhtml
@@ -28,7 +28,7 @@
                                           showTime="true"
                                           pattern="#{sessionController.applicationPreference.longDateTimeFormat}"  >                                                                              
                             </p:datePicker>
-                            <h:outputLabel value="To Date"/>
+                            <h:outputLabel value="User"/>
                             <p:selectOneMenu class="w-100 mx-4" filter="true" value="#{searchController.webUser}" id="acIx">
                                 <f:selectItem itemLabel="Select a user"/>
                                 <f:selectItems value="#{webUserController.items}" var="st" itemLabel="#{st.name}" itemValue="#{st}"/>
diff --git a/src/main/webapp/analytics/day_end_summery.xhtml b/src/main/webapp/analytics/day_end_summery.xhtml
new file mode 100644
index 0000000000..481d47a29e
--- /dev/null
+++ b/src/main/webapp/analytics/day_end_summery.xhtml
@@ -0,0 +1,326 @@
+<?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:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <h:body>
+
+        <ui:composition template="/analytics/index.xhtml">
+
+
+            <ui:define name="report">
+                <h:form>
+
+                    <p:panelGrid columns="2" >
+
+                        <p:outputLabel value="From" ></p:outputLabel>
+                        <p:calendar 
+                            value="#{financialTransactionController.fromDate}"
+                            pattern="#{sessionController.applicationPreference.longDateTimeFormat}"  ></p:calendar>
+
+                        <h:outputLabel value="To" ></h:outputLabel>
+                        <p:calendar 
+                            value="#{financialTransactionController.toDate}" 
+                            pattern="#{sessionController.applicationPreference.longDateTimeFormat}"  ></p:calendar>
+
+                        <h:outputLabel value="User"/>
+                        <p:selectOneMenu class="w-100 mx-4" filter="true" value="#{searchController.webUser}" id="acIx">
+                            <f:selectItem itemLabel="Select a user"/>
+                            <f:selectItems value="#{webUserController.items}" var="st" itemLabel="#{st.name}" itemValue="#{st}"/>
+                        </p:selectOneMenu>
+
+                        <h:commandButton action="#{financialTransactionController.processDayEndSummary()}" value="Process" ></h:commandButton>
+
+                    </p:panelGrid>
+
+                    <table class="table table-striped">
+                        <thead class="thead-dark">
+                            <tr class="table-primary">
+                                <th>Category</th>
+                                <th>In</th>
+                                <th>Out</th>
+                                <th>Net Total</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>
+                                    <p:commandLink 
+                                        value="Cash" 
+                                        action="#{financialTransactionController.navigateToCashierSummaryBreakdownFromShiftClosingForCash()}" 
+                                        ></p:commandLink>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.collectedCash}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.refundedCash}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.netCashTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <p:commandLink 
+                                        value="Card" 
+                                        action="#{financialTransactionController.navigateToCashierSummaryBreakdownFromShiftClosingForCard()}" 
+                                        ></p:commandLink>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.collectedCreditCard}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.refundedCreditCard}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.netCreditCardTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <p:commandLink 
+                                        value="Voucher" 
+                                        action="#{financialTransactionController.navigateToCashierSummaryBreakdownFromShiftClosingForAllExceptCashCardVaucher()}" 
+                                        ></p:commandLink>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.collectedVoucher}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.refundedVoucher}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.netVoucherTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <p:commandLink 
+                                        value="Other" 
+                                        action="#{financialTransactionController.navigateToCashierSummaryBreakdownFromShiftClosingForAllExceptCashCardVaucher()}" 
+                                        ></p:commandLink>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.collectedOtherNonCredit}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.refundedOtherNonCredit}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.netOtherNonCreditTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Float Start Funds</td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.shiftStartFunds}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td></td> <!-- Assuming no refunded column for My-Safe -->
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.shiftStartFunds}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td> <!-- Assuming My-Safe equals net for floats -->
+                            </tr>
+                            <tr>
+                                <td>Float Collected &nbsp; Handovers</td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.floatReceived}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.floatHandover}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td> <!-- Assuming no refunded column for floats -->
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.floatReceived - financialTransactionController.financialReportByPayments.floatHandover}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td> <!-- Assuming collected equals net for floats -->
+                            </tr>
+                            <tr>
+                                <td>Bank Transaction</td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.bankWithdrawals}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.bankDeposits}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td> <!-- Assuming no refunded column for bank withdrawals -->
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.bankWithdrawals - financialTransactionController.financialReportByPayments.bankDeposits}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td> <!-- Assuming withdrawals equals net -->
+                            </tr>
+                            <h:panelGroup rendered="false" >
+                                <tr>
+                                    <td>Cash In / Outs</td>
+                                    <td>
+                                        <h:outputText value="#{financialTransactionController.financialReportByPayments.cashCollectedTransferIn}">
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputText>
+                                    </td>
+                                    <td>
+                                        <h:outputText value="#{financialTransactionController.financialReportByPayments.cashGivenOutTransferOut}">
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputText>
+                                    </td> <!-- Assuming no refunded column for cash given out -->
+                                    <td>
+                                        <h:outputText value="#{financialTransactionController.financialReportByPayments.cashCollectedTransferIn - financialTransactionController.financialReportByPayments.cashGivenOutTransferOut}">
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputText>
+                                    </td> <!-- Assuming cash given out equals net -->
+                                </tr>
+                            </h:panelGroup>
+                            <tr class="table-primary"> 
+                                <td>Total</td>
+                                <td colspan="2"></td>
+                                <td>
+                                    <h:outputText value="#{financialTransactionController.financialReportByPayments.total}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+
+                    <p:commandButton value="Download Excel" ajax="false">
+                        <p:dataExporter target="tblPaymentSummary" type="xlsx" fileName="payment_summary" ></p:dataExporter>
+                    </p:commandButton>
+
+                    <p:dataTable id="tblPaymentSummary" value="#{financialTransactionController.paymentSummaryBundle.reportTemplateRows}" var="r"  styleClass="ui-datatable-striped">
+                        <p:column headerText="Service Type">
+                            <h:outputText value="#{r.serviceType != null ? r.serviceType.label : ''}" />
+                        </p:column>
+                        <p:column headerText="Bill Type">
+                            <h:outputText value="#{r.billTypeAtomic != null ? r.billTypeAtomic.label : ''}" />
+                        </p:column>
+                        <p:column headerText="Category">
+                            <h:outputText value="#{r.category != null ? r.category.name : ''}" />
+                        </p:column>
+                        <p:column headerText="Credit Company">
+                            <h:outputText value="#{r.creditCompany != null ? r.creditCompany.name : ''}" />
+                        </p:column>
+                        <p:column headerText="To Department">
+                            <h:outputText value="#{r.toDepartment != null ? r.toDepartment.name : ''}" />
+                        </p:column>
+                        <p:column headerText="Row Value">
+                            <h:outputText value="#{r.rowValue}">
+                                <f:convertNumber pattern="#,##0.00" />
+                            </h:outputText>
+                        </p:column>
+                    </p:dataTable>
+
+
+
+                    <h:panelGroup rendered="false" layout="block" class="w-100" style="overflow-x: scroll;">
+                        <p:commandButton value="Export to excel" >
+                            <p:dataExporter type="xlsx" target="tblPayments" fileName="exportedData"/>
+                        </p:commandButton>
+                        <p:dataTable 
+                            id="tblPayments" 
+                            value="#{financialTransactionController.paymentsFromShiftSratToNow}" 
+                            var="bp" 
+                            paginator="true"
+                            paginatorPosition="bottom"
+                            rows="5"
+                            style="width:150em;"
+                            rowKey="#{bp.id}"
+                            paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                            currentPageReportTemplate="{startRecord}-{endRecord} of {totalRecords} records"
+                            rowsPerPageTemplate="5,10,20,50,100">
+                            <p:column headerText="Payment ID" >
+                                <p:inputText value="#{bp.id}" ></p:inputText>
+                            </p:column>
+                            <p:column headerText="Time" >
+                                <h:outputText value="#{bp.createdAt}" >
+                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateTimeFormat}" ></f:convertDateTime>
+                                </h:outputText>
+                            </p:column>
+                            <p:column headerText="Payment Method" >
+                                <p:inputText value="#{bp.paymentMethod}" ></p:inputText>
+                            </p:column>
+                            <p:column headerText="Bill ID" >
+                                <p:inputText value="#{bp.bill.id}" ></p:inputText>
+                            </p:column>
+                            <p:column headerText="Bill Type" >
+                                <p:inputText value="#{bp.bill.billType}" ></p:inputText>
+                            </p:column>
+
+                            <p:column headerText="Bill Class" >
+                                <p:inputText value="#{bp.bill.billClass}" ></p:inputText>
+                            </p:column>
+                            <p:column headerText="Bill Type Atomic" >
+                                <p:inputText value="#{bp.bill.billTypeAtomic}" ></p:inputText>
+                            </p:column>
+                            <p:column headerText="Bill Type Atomic Cash Type" >
+                                <h:outputText value="#{bp.bill.billTypeAtomic.billFinanceType}" ></h:outputText>
+                            </p:column>
+                            <p:column headerText="Payment Method">
+                                <h:outputText value="#{bp.bill.paymentMethod}" ></h:outputText>
+                            </p:column>
+                            <p:column headerText="Patient">
+                                <h:outputText value="#{bp.bill.patient.person.nameWithTitle}" ></h:outputText>
+                            </p:column>
+                            <p:column headerText="Value" >
+                                <p:inputText value="#{bp.paidValue}" />
+                            </p:column>
+                            <p:column headerText="Action" >
+                                <p:commandButton 
+                                    class="ui-button-success"
+                                    icon=" fa-solid fa-eye"
+                                    value="View Bill" 
+                                    ajax="false"
+                                    action="#{billSearch.navigateViewBillByBillTypeAtomic()}"
+                                    >
+                                    <f:setPropertyActionListener value="#{bp.bill}" target="#{billSearch.bill}"/>
+                                </p:commandButton>
+                            </p:column>
+                        </p:dataTable>
+                    </h:panelGroup>
+
+
+                </h:form>
+
+
+            </ui:define>
+        </ui:composition>
+
+    </h:body>
+</html>
diff --git a/src/main/webapp/analytics/index.xhtml b/src/main/webapp/analytics/index.xhtml
index dea949d5e0..a90643fd43 100644
--- a/src/main/webapp/analytics/index.xhtml
+++ b/src/main/webapp/analytics/index.xhtml
@@ -35,6 +35,12 @@
                                     </p:tab>
                                     <p:tab title="Lists">
                                         <div class="d-grid gap-2">
+                                            <p:commandButton 
+                                                ajax="false" 
+                                                value="Day End Summary" 
+                                                action="#{financialTransactionController.navigateToDayEndSummary()}"
+                                                class="w-100">
+                                            </p:commandButton>
                                             <p:commandButton 
                                                 ajax="false" 
                                                 value="User Bill Summary" 
diff --git a/src/main/webapp/channel/channel_booking_by_date.xhtml b/src/main/webapp/channel/channel_booking_by_date.xhtml
index 1eb96d6f85..75a3b9ae80 100644
--- a/src/main/webapp/channel/channel_booking_by_date.xhtml
+++ b/src/main/webapp/channel/channel_booking_by_date.xhtml
@@ -49,16 +49,20 @@
 
                                         <div class="d-flex align-items-center w-100">
                                             <p:inputText id="txtFilter" class="w-100" value="#{bookingControllerViewScope.sessionInstanceFilter}" placeholder="Search">
-                                                <p:ajax event="keyup" process="@this" update="groupFilteredSessions gdManageBookings panelBookingDetails" listener="#{bookingControllerViewScope.filterSessionInstances}"></p:ajax>
+                                                <p:ajax event="keyup" process="@this" update="groupFilteredSessions gdManageBookings panelBookingDetails" 
+                                                        listener="#{bookingControllerViewScope.filterSessionInstancesNew}"></p:ajax>
                                             </p:inputText>
 
                                         </div>
+
                                         <div class="d-flex align-items-center w-100">
-                                            <p:commandButton value="Today" action="#{bookingControllerViewScope.addToDayToToDate()}" ajax="false" class="mx-1 ui-button-info" ></p:commandButton>
-                                            <p:commandButton value="+1" action="#{bookingControllerViewScope.addSingleDateToToDate()}" ajax="false" class="mx-1 ui-button-info" ></p:commandButton>
-                                            <p:commandButton value="+2" action="#{bookingControllerViewScope.addTwoDays()}" ajax="false" class="mx-1 ui-button-info" ></p:commandButton>
-                                            <p:commandButton value="+7" action="#{bookingControllerViewScope.addSevenDays()}" ajax="false" class="mx-1 ui-button-info" ></p:commandButton>
-                                            <p:commandButton value="+1 Month" action="#{bookingControllerViewScope.addMonth()}" ajax="false" class="mx-1 ui-button-info" ></p:commandButton>
+
+                                            <p:commandButton value="Today" action="#{bookingControllerViewScope.addToDayToToDateNew()}" ajax="false" class="mx-1 ui-button-info"></p:commandButton>
+                                            <p:commandButton value="+1" action="#{bookingControllerViewScope.addSingleDateToToDateNew()}" ajax="false" class="mx-1 ui-button-info"></p:commandButton>
+                                            <p:commandButton value="+2" action="#{bookingControllerViewScope.addTwoDaysNew()}" ajax="false" class="mx-1 ui-button-info"></p:commandButton>
+                                            <p:commandButton value="+7" action="#{bookingControllerViewScope.addSevenDaysNew()}" ajax="false" class="mx-1 ui-button-info"></p:commandButton>
+                                            <p:commandButton value="+1 Month" action="#{bookingControllerViewScope.addMonthNew()}" ajax="false" class="mx-1 ui-button-info"></p:commandButton>
+
                                         </div>
                                     </div>
 
@@ -71,46 +75,49 @@
                                                 styleClass="ui-button-warning mx-1" 
                                                 action="#{opdBillController.navigateToNewOpdBill()}"
                                                 rendered="#{configOptionApplicationController.getBooleanValueByKey('Enable Navigation Button To OPD Billing From Channel Booking By Date')}"/>
-                                            
+
+
+                                            <!-- List All Session Data Button -->
+                                            <p:commandButton 
+                                                ajax="false" 
+                                                title="All" 
+                                                icon="fa fa-list" 
+                                                styleClass="ui-button-primary mx-1" 
+                                                action="#{bookingControllerViewScope.listAll}" />
+
+                                            <!-- View Completed Session Data Button -->
                                             <p:commandButton 
                                                 ajax="false" 
                                                 title="Completed" 
                                                 icon="fa fa-check"
                                                 styleClass="ui-button-secondary mx-1" 
-                                                action="#{bookingControllerViewScope.listCompletedSesionInstances()}" />
+                                                action="#{bookingControllerViewScope.listCompleted()}" />
 
                                             <!-- View Ongoing Session Data Button -->
                                             <p:commandButton 
                                                 ajax="false" 
-                                                title="Ongoing"
-                                                icon="fa fa-sync-alt"
+                                                title="Ongoing" 
+                                                icon="fa fa-sync-alt" 
                                                 styleClass="ui-button-success mx-1" 
-                                                action="#{bookingControllerViewScope.listOngoingSesionInstances()}" />
+                                                action="#{bookingControllerViewScope.listOngoing()}" />
 
-                                            <!-- List Pending Button -->
+                                            <!-- View Pending Session Data Button -->
                                             <p:commandButton 
                                                 ajax="false" 
-                                                title="Pending"
-                                                icon="fa fa-hourglass-start"
-                                                styleClass="ui-button-primary mx-1" 
-                                                action="#{bookingControllerViewScope.listPendingSesionInstances()}" />
+                                                title="Pending" 
+                                                icon="fa fa-hourglass-half" 
+                                                styleClass="ui-button-warning mx-1" 
+                                                action="#{bookingControllerViewScope.listPending()}" />
 
-                                            <!-- List Cancelled Button -->
+                                            <!-- View Cancelled Session Data Button -->
                                             <p:commandButton 
-                                                title="Cancelled"
                                                 ajax="false" 
+                                                title="Cancelled"
                                                 icon="fa fa-times-circle"
                                                 styleClass="ui-button-danger mx-1" 
-                                                action="#{bookingControllerViewScope.listCancelledSesionInstances()}" />
+                                                action="#{bookingControllerViewScope.listCancelled()}" />
 
 
-                                            <!-- List All Button -->
-                                            <p:commandButton 
-                                                ajax="false" 
-                                                title="All"
-                                                icon="fa fa-list" 
-                                                styleClass="ui-button-primary mx-1" 
-                                                action="#{bookingControllerViewScope.listAllSesionInstances()}" />
 
 
                                         </div>
@@ -268,7 +275,7 @@
                                         <common:patient_details_view_scope
                                             editable="#{true}"
                                             controller="#{bookingControllerViewScope}"/>
-                                        
+
                                         <h:panelGroup id="gpAdditionalItems" >
                                             <p:panel header="Additional Items" rendered="#{not empty bookingControllerViewScope.itemsAvailableToAddToBooking}">
                                                 <p:row >
diff --git a/src/main/webapp/dataAdmin/report.xhtml b/src/main/webapp/dataAdmin/report.xhtml
index e5c7d2d1a1..44f37df918 100644
--- a/src/main/webapp/dataAdmin/report.xhtml
+++ b/src/main/webapp/dataAdmin/report.xhtml
@@ -1,11 +1,10 @@
-<?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:ez="http://xmlns.jcp.org/jsf/composite/ezcomp">
+      xmlns:ez="http://xmlns.jcp.org/jsf/composite/ezcomp/report_templates">
 
     <h:body>
         <ui:composition template="/dataAdmin/admin_data_administration.xhtml">
@@ -14,11 +13,10 @@
                 <h:form id="reportForm">
                     <p:messages id="messages" showDetail="true" closable="true" />
 
-                    
-                    <p:panelGrid columns="1"  class="w-100 m-2 p-2">
-                        <f:facet name="header" >
-                            <p:outputLabel value="Report" ></p:outputLabel>
-                            <p:commandButton class="mx-5" value="Save" ajax="false" action="#{reportTemplateController.processReport()}" ></p:commandButton>
+                    <p:panelGrid columns="1" class="w-100 m-2 p-2">
+                        <f:facet name="header">
+                            <p:outputLabel value="Report" />
+                            <p:commandButton class="mx-5" value="Process" ajax="false" action="#{reportTemplateController.processReport()}" />
                         </f:facet>
                         
                         <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('DATE')}" >
@@ -39,13 +37,86 @@
                         <p:dataTable value="#{reportTemplateController.reportTemplateRows}" var="rtr" rowKey="" >
                         
                         </p:dataTable>
-                       
-                        
+                                 
                     </p:panelGrid>
 
 
-                </h:form>
+                        <h:panelGroup >
+                            <h1>
+                                <p:outputLabel value="Report : " />
+                                <p:outputLabel value="#{reportTemplateController.current.name}" />
+                            </h1>
+                        </h:panelGroup>
+
+                        <h:panelGroup >
+                            <p:outputLabel value="Report Type:"  />
+                            <p:selectOneMenu  value="#{reportTemplateController.current.reportTemplateType}"
+                                              filter="true"
+                                              filterMatchMode="contains"
+                                              class="w-100">
+                                <f:selectItems value="#{reportTemplateController.reportTemplateTypes}" var="type"
+                                               itemLabel="#{type}" itemValue="#{type}" />
+                            </p:selectOneMenu>
+                        </h:panelGroup>
+
+
+
+
+                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('DATE')}">
+                            <p:outputLabel value="Date:"  />
+                            <p:calendar id="calDate" value="#{reportTemplateController.date}" required="true" class="w-100"/>
+                        </h:panelGroup>
+
+                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('FROM_DATE')}">
+                            <p:outputLabel value="From Date"  />
+                            <p:calendar id="calFromDate" value="#{reportTemplateController.fromDate}" required="true" class="w-100"/>
+                        </h:panelGroup>
+
+                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('TO_DATE')}">
+                            <p:outputLabel value="To Date"  />
+                            <p:calendar id="calToDate" value="#{reportTemplateController.toDate}" required="true" class="w-100"/>
+                        </h:panelGroup>
+
+
 
+                        <h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('CREDIT_COMPANY')}">
+                            <p:outputLabel value="Credit Company"  />
+                            <p:autoComplete class="w-75 mx-2" id="agent2" forceSelection="true"
+                                            value="#{reportTemplateController.creditCompany}" completeMethod="#{agencyController.completeAgency}" var="ix"
+                                            itemLabel="#{ix.name}" itemValue="#{ix}" size="38">
+                            </p:autoComplete>
+                        </h:panelGroup>
+
+
+
+                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY'}">
+                            <ez:report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department 
+                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                        </h:panelGroup>
+                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_FEES'}">
+                            <ez:report_bill_fee_grouped_by_atomic_bill_type
+                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                        </h:panelGroup>
+                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
+                            <ez:report_bill_fee_grouped_by_atomic_bill_type
+                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                        </h:panelGroup>
+
+
+                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
+                            <ez:report_bill_fee_grouped_by_atomic_bill_type
+                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                        </h:panelGroup>
+
+
+                        <h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM'}">
+                            <ez:report_item_cateroy_value
+                                bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
+                        </h:panelGroup>
+
+                    </p:panelGrid>
+
+                </h:form>
 
             </ui:define>
         </ui:composition>
diff --git a/src/main/webapp/dataAdmin/report_template_list.xhtml b/src/main/webapp/dataAdmin/report_template_list.xhtml
index 076e0c1bb4..ffdd172956 100644
--- a/src/main/webapp/dataAdmin/report_template_list.xhtml
+++ b/src/main/webapp/dataAdmin/report_template_list.xhtml
@@ -23,7 +23,7 @@
                             <p:commandButton value="Edit" action="#{reportTemplateController.navigateToEditReportTemplate()}" ajax="false" >
                                 <f:setPropertyActionListener value="#{t}" target="#{reportTemplateController.current}" ></f:setPropertyActionListener>
                             </p:commandButton>
-                            <p:commandButton value="Edit" action="#{reportTemplateController.navigateToEditGenerateReport()}" ajax="false" >
+                            <p:commandButton value="To Run" action="#{reportTemplateController.navigateToGenerateReport()}" ajax="false" >
                                 <f:setPropertyActionListener value="#{t}" target="#{reportTemplateController.current}" ></f:setPropertyActionListener>
                             </p:commandButton>
                         </p:column>
diff --git a/src/main/webapp/opd/opd_bill.xhtml b/src/main/webapp/opd/opd_bill.xhtml
index 5cbc391662..6385e40a61 100644
--- a/src/main/webapp/opd/opd_bill.xhtml
+++ b/src/main/webapp/opd/opd_bill.xhtml
@@ -844,26 +844,26 @@
                                         </div>
 
                                         <div class="col-md-4" >
-                                            <h:panelGroup id="gpLocalForeign"  class="col-md-6" >
-                                                <p:commandButton value="Mark Foreigner" 
-                                                                 class="mx-2"
-                                                                 action="#{opdBillController.markAsForeigner}" 
-                                                                 rendered="#{!opdBillController.foreigner}" 
-                                                                 process="@this" 
-                                                                 update="gpLocalForeign :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId} tblBillItem paymentDetails" 
-                                                                 ></p:commandButton>
-                                                <p:commandButton value="Mark Local" 
-                                                                 class="mx-2"
-                                                                 action="#{opdBillController.markAsLocal}" 
-                                                                 rendered="#{opdBillController.foreigner}" 
-                                                                 process="@this" 
-                                                                 update="gpLocalForeign :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId} tblBillItem paymentDetails" 
-                                                                 ></p:commandButton>
-                                                <!--                                                <p:commandButton value="Print Last Bill" 
-                                                                                                                 class="btn m-1"
-                                                                                                                 ajax="false" 
-                                                                                                                 action="opd_bill_print_last" >
-                                                                                                </p:commandButton>-->
+                                            <h:panelGroup id="gpLocalForeign"  class="col-md-6" rendered="#{!configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}">
+                                                <p:commandButton 
+                                                    value="Mark Foreigner" 
+                                                    class="mx-2"
+                                                    action="#{opdBillController.markAsForeigner}" 
+                                                    rendered="#{!opdBillController.foreigner}" 
+                                                    process="@this" 
+                                                    update="gpLocalForeign :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId} tblBillItem paymentDetails" 
+                                                    >
+                                                </p:commandButton>
+                                                <p:commandButton 
+                                                    value="Mark Local" 
+                                                    class="mx-2"
+                                                    action="#{opdBillController.markAsLocal}" 
+                                                    rendered="#{opdBillController.foreigner}" 
+                                                    process="@this" 
+                                                    update="gpLocalForeign :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId} tblBillItem paymentDetails" 
+                                                    >
+                                                </p:commandButton>
+
                                             </h:panelGroup>
                                         </div>
                                     </div>
diff --git a/src/main/webapp/opd/patient.xhtml b/src/main/webapp/opd/patient.xhtml
index f9da56f195..4c0c1cbf21 100644
--- a/src/main/webapp/opd/patient.xhtml
+++ b/src/main/webapp/opd/patient.xhtml
@@ -93,7 +93,13 @@
                                         <p:outputLabel value="Blood Group:" rendered="#{not empty patientController.current.person.bloodGroup.name}" />
                                         <p:outputLabel value="#{patientController.current.person.bloodGroup.name}" rendered="#{not empty patientController.current.person.bloodGroup.name}" />
 
-
+                                        <p:outputLabel value="Patient Status :" rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}"/>
+                                        <p:badge 
+                                            rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}"
+                                            value="#{patientController.current.person.foreigner?'Patient is Forigner':'Patient is Local'}" 
+                                            severity="#{patientController.current.person.foreigner?'warning':'success'}" 
+                                            styleClass="mr-2">
+                                        </p:badge>
                                         <p:outputLabel value="Has an Account:"  />
                                         <p:outputLabel value="#{patientController.current.hasAnAccount?'Has an account':'No Account'}" />
 
@@ -105,7 +111,6 @@
                                         <p:outputLabel value="#{patientController.current.creditLimit}" rendered="#{patientController.current.hasAnAccount}" />
 
 
-
                                     </p:panelGrid>
 
                                     <h:panelGroup id="groupPatientCard" style="text-align: center; width: 5cm; border: 1px solid red;" layout="block">
diff --git a/src/main/webapp/opd/patient_edit.xhtml b/src/main/webapp/opd/patient_edit.xhtml
index f269e8f8d1..b99d5588db 100644
--- a/src/main/webapp/opd/patient_edit.xhtml
+++ b/src/main/webapp/opd/patient_edit.xhtml
@@ -197,7 +197,7 @@
                                                 required="#{sessionController.departmentPreference.needAreaForPatientRegistration}"
                                                 requiredMessage="Need an Area"
                                                 >
-                                                
+
                                             </p:autoComplete> 
                                         </div>
                                     </div>
@@ -234,13 +234,22 @@
                                         </div>
                                     </div>
                                     <div class="row form-group ">
-                                        <div class="col-md-6">
+                                        <div class="col-md-3">
                                             <p:outputLabel value="Patient Account:"  class="form-label w-100" />
                                             <p:selectBooleanButton value="#{patientController.current.hasAnAccount}"
                                                                    offLabel="Patient has No Account"
                                                                    class="w-100"
                                                                    onLabel="Patient has An account" ></p:selectBooleanButton>
                                         </div>
+                                        <div class="col-md-3">
+                                            <p:outputLabel value="Mark as forigner :"  class="form-label w-100" />
+                                            <p:selectBooleanButton 
+                                                value="#{patientController.current.person.foreigner}"
+                                                offLabel="Patient is Local"
+                                                class="w-100"
+                                                onLabel="Patient is Forigner" >
+                                            </p:selectBooleanButton>
+                                        </div>
                                         <div class="col-md-6" >
                                             <h:outputLabel class="form-label" value="Credit Limit:" rendered="#{webUserController.hasPrivilege('Admin')}" />
                                             <h:panelGroup>
diff --git a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml
index bc08ba04ec..5ab1f8485d 100644
--- a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml
+++ b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml
@@ -83,7 +83,8 @@
                                 action="#{patientController.quickSearchPatientLongPhoneNumber(cc.attrs.controller)}" 
                                 process="btnSearchbyPhoneNo txtQuickSearchPhoneNumber"
                                 update="ptImp selectPatient editPatient viewPatient"
-                                styleClass="btn-sm mx-1"/>
+                                styleClass="btn-sm mx-1">
+                            </p:commandButton>
                             <p:defaultCommand target="btnSearchbyPhoneNo"> </p:defaultCommand>
                             <p:commandButton 
                                 id="btnAddNewPatient"
@@ -145,7 +146,7 @@
                                     </div>
                                     <div class="col-md-9 p-1">
                                         <p:inputText 
-                                            
+
                                             requiredMessage="Please enter a name for the patient"
                                             autocomplete="off" 
                                             id="txtNewPtName" 
@@ -165,7 +166,7 @@
                                     <div class="col-md-3 p-1">
                                         <p:selectOneMenu 
                                             id="cmbSex" 
-                                            
+
                                             requiredMessage="Please select a gender"
                                             value="#{cc.attrs.controller.patient.person.sex}"
                                             class="form-control w-100">
@@ -275,7 +276,7 @@
                                 </div>
 
                                 <div class="row">
-                                    <div class="col-md-8 p-1">
+                                    <div class="col-md-7 p-1">
                                         <p:inputText
                                             id="txtAddress"
                                             autocomplete="off"
@@ -284,7 +285,18 @@
                                             value="#{cc.attrs.controller.patient.person.address}"
                                             class="form-control"/>
                                     </div>
-                                    <div class="col-md-4 p-1">
+
+                                    <h:panelGroup class="col-md-2 p-1" rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}">
+                                        <p:selectBooleanButton 
+                                            id="scbforigner"
+                                            value="#{cc.attrs.controller.patient.person.foreigner}"
+                                            offLabel="Patient is Local"
+                                            class="w-100"
+                                            onLabel="Patient is Forigner" >
+                                        </p:selectBooleanButton>
+                                    </h:panelGroup>
+
+                                    <div class="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')?'col-md-3 p-1':'col-md-5 p-1'}">
                                         <p:autoComplete 
                                             id="acNewPtArea" 
                                             requiredMessage="Please select an Area"
@@ -308,7 +320,7 @@
                                 <p:tooltip for="cmbTitle" value="Title"  showDelay="0" hideDelay="0"></p:tooltip>
                                 <p:tooltip for="acNewPtArea" value="Area"  showDelay="0" hideDelay="0"></p:tooltip>
                                 <p:tooltip for="txtEmail" value="Email"  showDelay="0" hideDelay="0"></p:tooltip>
-
+                                <p:tooltip for="scbforigner" value="Mark Status"  showDelay="0" hideDelay="0"></p:tooltip>
                                 <p:tooltip for="year" value="Age- Years Component"  showDelay="0" hideDelay="0"></p:tooltip>
                                 <p:tooltip for="month" value="Age- Month Component"  showDelay="0" hideDelay="0"></p:tooltip>
                                 <p:tooltip for="day" value="Age- Days Component"  showDelay="0" hideDelay="0"></p:tooltip>
@@ -362,6 +374,16 @@
                             <h:outputLabel value=" : " class="mx-3"/>
                             <h:outputText value="#{cc.attrs.controller.patient.person.address}" />
 
+                            
+                            <h:outputLabel value="Patient Status " class="mx-3" rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}"/>
+                            <h:outputLabel value=" : " class="mx-3" rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}"/>
+                            <p:badge 
+                                rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}"
+                                value="#{cc.attrs.controller.patient.person.foreigner?'Patient is Forigner':'Patient is Local'}" 
+                                severity="#{cc.attrs.controller.patient.person.foreigner?'warning':'success'}" 
+                                styleClass="mr-2">
+                            </p:badge>
+
                             <h:outputLabel value="Area " class="mx-3"/>
                             <h:outputLabel value=" : " class="mx-3"/>
                             <h:outputText value="#{cc.attrs.controller.patient.person.area.name}" />
diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml
index 2d60f0d872..cbaac8bd00 100644
--- a/src/main/webapp/resources/ezcomp/menu.xhtml
+++ b/src/main/webapp/resources/ezcomp/menu.xhtml
@@ -879,7 +879,7 @@
                     <p:menuitem 
                         ajax="false"  
                         value="Channel Booking - By Dates"  
-                        action="#{bookingControllerViewScope.navigateToChannelBookingFromMenuByDate()}" 
+                        action="#{bookingControllerViewScope.navigateToChannelBookingFromMenuByDateNew()}" 
                         rendered="#{webUserController.hasPrivilege('ChannellingChannelBooking')}" >
                     </p:menuitem>
                     <p:menuitem 
diff --git a/src/main/webapp/resources/ezcomp/report_templates/report_bill_fee_grouped_by_atomic_bill_type.xhtml b/src/main/webapp/resources/ezcomp/report_templates/report_bill_fee_grouped_by_atomic_bill_type.xhtml
new file mode 100644
index 0000000000..4865e85879
--- /dev/null
+++ b/src/main/webapp/resources/ezcomp/report_templates/report_bill_fee_grouped_by_atomic_bill_type.xhtml
@@ -0,0 +1,30 @@
+<?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:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+        <cc:attribute name="bundle" type="com.divudi.data.ReportTemplateRowBundle" />
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation>
+        <p:dataTable value="#{reportTemplateController.reportTemplateRowBundle.reportTemplateRows}" var="rtr" rowKey="#{rtr.id}">
+
+            <p:column headerText="Bill Type">
+                <h:outputText value="#{rtr.billTypeAtomic}" />
+            </p:column>
+            <p:column headerText="Fee Sum">
+                <h:outputText value="#{rtr.rowValue}" >
+                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                </h:outputText>
+            </p:column>
+
+        </p:dataTable>
+
+    </cc:implementation>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/ezcomp/report_templates/report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department.xhtml b/src/main/webapp/resources/ezcomp/report_templates/report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department.xhtml
new file mode 100644
index 0000000000..b498ff2047
--- /dev/null
+++ b/src/main/webapp/resources/ezcomp/report_templates/report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department.xhtml
@@ -0,0 +1,39 @@
+<?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:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+        <cc:attribute name="bundle" type="com.divudi.data.ReportTemplateRowBundle" />
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation>
+        <p:dataTable value="#{reportTemplateController.reportTemplateRowBundle.reportTemplateRows}" var="rtr" rowKey="#{rtr.id}">
+
+            <p:column headerText="Bill Type">
+                <h:outputText value="#{rtr.billTypeAtomic}" />
+            </p:column>
+
+            <p:column headerText="Category Name">
+                <h:outputText value="#{rtr.categoryName}" />
+            </p:column>
+
+            <p:column headerText="To Department Name">
+                <h:outputText value="#{rtr.toDepartmentName}" />
+            </p:column>
+
+            <p:column headerText="Fee Sum">
+                <h:outputText value="#{rtr.rowValue}" >
+                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                </h:outputText>
+            </p:column>
+
+        </p:dataTable>
+
+    </cc:implementation>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/ezcomp/report_templates/report_item_cateroy_value.xhtml b/src/main/webapp/resources/ezcomp/report_templates/report_item_cateroy_value.xhtml
new file mode 100644
index 0000000000..cc73879a82
--- /dev/null
+++ b/src/main/webapp/resources/ezcomp/report_templates/report_item_cateroy_value.xhtml
@@ -0,0 +1,30 @@
+<?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:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+        <cc:attribute name="bundle" type="com.divudi.data.ReportTemplateRowBundle" />
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation>
+        <p:dataTable value="#{reportTemplateController.reportTemplateRowBundle.reportTemplateRows}" var="rtr" rowKey="#{rtr.id}">
+            <p:column headerText="Category Name">
+                <h:outputText value="#{rtr.categoryName}" />
+            </p:column>
+
+            <p:column headerText="Value">
+                <h:outputText value="#{rtr.rowValue}" >
+                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                </h:outputText>
+            </p:column>
+
+        </p:dataTable>
+
+    </cc:implementation>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/paymentMethod/multiple_payment_methods.xhtml b/src/main/webapp/resources/paymentMethod/multiple_payment_methods.xhtml
index 6d57fcb3c5..3e26f20275 100644
--- a/src/main/webapp/resources/paymentMethod/multiple_payment_methods.xhtml
+++ b/src/main/webapp/resources/paymentMethod/multiple_payment_methods.xhtml
@@ -99,6 +99,9 @@
                                 </h:panelGroup>
                                 <h:panelGroup id="patientDeposit"  rendered="#{pm.paymentMethod eq 'PatientDeposit'}"  layout="block" class="row" >
                                     <pa:patient_deposit valueRequired="true" paymentMethodData="#{pm.paymentMethodData}"/>
+                                </h:panelGroup>                               
+                                <h:panelGroup id="Staff_Welfare" rendered="#{pm.paymentMethod eq 'Staff_Welfare'}" layout="block" class="row">
+                                    <pa:staff_welfare valueRequired="true" paymentMethodData="#{pm.paymentMethodData}"/>
                                 </h:panelGroup>
 
 
diff --git a/src/main/webapp/resources/paymentMethod/staff_welfare.xhtml b/src/main/webapp/resources/paymentMethod/staff_welfare.xhtml
new file mode 100644
index 0000000000..e0ae9f4780
--- /dev/null
+++ b/src/main/webapp/resources/paymentMethod/staff_welfare.xhtml
@@ -0,0 +1,53 @@
+<?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:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+        <cc:attribute name="paymentMethodData"  type="com.divudi.data.dataStructure.PaymentMethodData" />
+        <cc:attribute name="valueRequired" type="boolean" />
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation>
+        <p:autoComplete  
+            minQueryLength="3"
+            forceSelection="true" 
+            value="#{opdBillController.toStaff}" 
+            id="welfareStaff"
+            completeMethod="#{staffController.completeStaff}" 
+            var="mys" 
+            class="w-100"
+            placeholder="Staff (Type at least 4 letters to search)"
+            inputStyleClass="form-control"
+            itemLabel="#{mys.person.name}" 
+            itemValue="#{mys}"
+            size="10">
+            <p:column headerText="Name" style="padding: 2px;">
+                <h:outputText value="#{mys.person.nameWithTitle}" ></h:outputText>
+            </p:column>
+            <p:column headerText="EPF" style="padding: 2px;">
+                <h:outputText value="#{mys.epfNo}" ></h:outputText>
+            </p:column>
+            <p:column headerText="Welfare Entitlement" style="padding: 2px;">
+                <h:outputText value="#{mys.annualWelfareQualified}" >
+                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                </h:outputText>
+            </p:column>
+            <p:column  headerText="Welfare Utilized" style="padding: 2px;">
+                <h:outputText value="#{mys.annualWelfareUtilized}" >
+                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                </h:outputText>
+            </p:column>
+            <p:ajax process="@this" 
+                    update=":#{p:resolveFirstComponentWithId('pBillDetails',view).clientId}  :#{p:resolveFirstComponentWithId('tblRequests',view).clientId} :#{p:resolveFirstComponentWithId('tblBillItem',view).clientId}"
+                    event="itemSelect"  
+                    listener="#{opdBillController.calTotals()}" />
+        </p:autoComplete>
+
+    </cc:implementation>
+</html>
\ No newline at end of file