diff --git a/pom.xml b/pom.xml
index 309dfbdffb..65afc125dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.divudi</groupId>
+
     <artifactId>sethma</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
diff --git a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
index 9fdf181f64..5e2f98a257 100644
--- a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
+++ b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
@@ -139,11 +139,6 @@ public class FinancialTransactionController implements Serializable {
 
     private ReportTemplateRowBundle paymentSummaryBundle;
 
-    private Date fromDate;
-    private Date toDate;
-
-    private ReportTemplateRowBundle paymentSummaryBundle;
-
     // </editor-fold>  
     // <editor-fold defaultstate="collapsed" desc="Constructors">
     public FinancialTransactionController() {
diff --git a/src/main/java/com/divudi/bean/common/BillPackageController.java b/src/main/java/com/divudi/bean/common/BillPackageController.java
index bbddbd3e93..550857e2b3 100644
--- a/src/main/java/com/divudi/bean/common/BillPackageController.java
+++ b/src/main/java/com/divudi/bean/common/BillPackageController.java
@@ -125,6 +125,11 @@ public class BillPackageController implements Serializable, ControllerWithPatien
     @Inject
     ConfigOptionApplicationController configOptionApplicationController;
 
+    private List<Item> malePackaes;
+    private List<Item> femalePackaes;
+    private List<Item> bothPackaes;
+    private List<Item> packaes;
+
     //</editor-fold>
     // <editor-fold defaultstate="collapsed" desc="Class Variables">
     private static final long serialVersionUID = 1L;
@@ -221,7 +226,6 @@ public void putToBills() {
                 }
             }
             myBill.setBillItems(list);
-            //////System.out.println("555");
             getBillBean().calculateBillItems(myBill, tmp);
             bills.add(myBill);
         }
@@ -288,7 +292,6 @@ public void cancellAll() {
             getBillSearch().setBill((BilledBill) b);
             getBillSearch().setPaymentMethod(b.getPaymentMethod());
             getBillSearch().setComment("Batch Cancell");
-            //////System.out.println("ggg : " + getBillSearch().getComment());
             getBillSearch().cancelOpdBill();
         }
 
@@ -302,9 +305,7 @@ public void cancellAll() {
     private void saveBillItemSessions() {
         for (BillEntry be : lstBillEntries) {
             BillItem temBi = be.getBillItem();
-            ////System.out.println("temBi = " + temBi);
             BillSession temBs = getServiceSessionBean().createBillSession(temBi);
-            ////System.out.println("temBs = " + temBs);
             temBi.setBillSession(temBs);
             if (temBs != null) {
                 getBillSessionFacade().create(temBs);
@@ -326,9 +327,7 @@ public void settleBill() {
             getBills().add(b);
 
         } else {
-            //    //////System.out.println("11");
             putToBills();
-            //   //////System.out.println("22");
         }
 
         saveBatchBill();
@@ -354,7 +353,6 @@ public void settleBill() {
         saveBillItemSessions();
 
         clearBillItemValues();
-        //////System.out.println("33");
 
         JsfUtil.addSuccessMessage(
                 "Bill Saved");
@@ -798,8 +796,6 @@ private void addEntry(BillItem bi) {
     }
 
     public void addToBill() {
-//        System.out.println("getCurrentBillItem = " + getCurrentBillItem());
-//        System.out.println("getCurrentBillItem.item = " + getCurrentBillItem().getItem().getName());
         if (getLstBillEntries().size() > 0) {
             JsfUtil.addErrorMessage("You can not add more than on package at a time create new bill");
             return;
@@ -945,7 +941,7 @@ public void recreateList(BillEntry r) {
         for (BillEntry b : getLstBillEntries()) {
             if (b.getBillItem().getItem() != r.getBillItem().getItem()) {
                 temp.add(b);
-                //////System.out.println(b.getBillItem().getNetValue());
+
             }
         }
         lstBillEntries = temp;
@@ -1448,4 +1444,101 @@ public void setToStaff(Staff toStaff) {
         this.toStaff = toStaff;
     }
 
+    public List<Item> getMalePackaes() {
+        return malePackaes;
+    }
+
+    public void setMalePackaes(List<Item> malePackaes) {
+        this.malePackaes = malePackaes;
+    }
+
+    public List<Item> getFemalePackaes() {
+        return femalePackaes;
+    }
+
+    public void setFemalePackaes(List<Item> femalePackaes) {
+        this.femalePackaes = femalePackaes;
+    }
+
+    public List<Item> getBothPackaes() {
+        return bothPackaes;
+    }
+
+    public void setBothPackaes(List<Item> bothPackaes) {
+        this.bothPackaes = bothPackaes;
+    }
+    
+    
+
+    public List<Item> getGenderBasedPackaes() {
+        //System.out.println("getPackages");
+        if (packaes == null) {
+            fillPackages();
+        }
+        if (configOptionApplicationController.getBooleanValueByKey("Package bill – Reloading of Packages with Consideration of Gender")) {
+            //System.out.println("option ok");
+            if (getPatient() == null) {
+                //System.out.println("pt is null");
+                return packaes;
+            } else if (getPatient().getPerson().getSex() == null) {
+                //System.out.println("sex is null");
+                return packaes;
+            } else if (getPatient().getPerson().getSex() == Sex.Male) {
+                //System.out.println("males");
+                return malePackaes;
+            } else if (getPatient().getPerson().getSex() == Sex.Female) {
+                //System.out.println("females");
+                return femalePackaes;
+            } else {
+                return bothPackaes;
+            }
+        }
+        return packaes;
+    }
+
+    public void setPackaes(List<Item> packaes) {
+        this.packaes = packaes;
+    }
+    
+    public List<Item> getPackaes() {
+        if(packaes==null){
+            packaes=itemController.getPackaes();
+            fillPackages();
+        }
+        return packaes;
+    }
+
+    private void fillPackages() {
+        //System.out.println("fillPackages");
+        packaes = itemController.getPackaes();
+        //System.out.println("packaes = " + packaes);
+        if (packaes == null) {
+            return;
+        }
+        malePackaes = new ArrayList<>();
+        femalePackaes = new ArrayList<>();
+        bothPackaes = new ArrayList<>();
+        for (Item i : packaes) {
+            //System.out.println("i = " + i);
+            if (i.getForGender() == null) {
+                //System.out.println("gender nill");
+                bothPackaes.add(i);
+            } else if (i.getForGender().equalsIgnoreCase("Male")) {
+                //System.out.println("mp = " );
+                malePackaes.add(i);
+            } else if (i.getForGender().equalsIgnoreCase("Female")) {
+                //System.out.println("fp = " );
+                femalePackaes.add(i);
+            } else if (i.getForGender().equalsIgnoreCase("Both")) {
+                bothPackaes.add(i);
+                malePackaes.add(i);
+                femalePackaes.add(i);
+            } else {
+                bothPackaes.add(i);
+            }
+        }
+    }
+
+    
+
 }
diff --git a/src/main/java/com/divudi/bean/common/ItemController.java b/src/main/java/com/divudi/bean/common/ItemController.java
index 86fda9aa96..8508decc0e 100644
--- a/src/main/java/com/divudi/bean/common/ItemController.java
+++ b/src/main/java/com/divudi/bean/common/ItemController.java
@@ -32,6 +32,7 @@
 import com.divudi.facade.ItemFeeFacade;
 import com.divudi.bean.common.util.JsfUtil;
 import com.divudi.data.SessionNumberType;
+import com.divudi.data.Sex;
 import com.divudi.entity.UserPreference;
 import com.divudi.facade.DepartmentFacade;
 import com.divudi.facade.ItemMappingFacade;
@@ -138,6 +139,7 @@ public class ItemController implements Serializable {
     private InstitutionItemCount institutionItemCount;
     private List<Item> suggestItems;
     boolean masterItem;
+    private Sex patientGender;
 
     ReportKeyWord reportKeyWord;
 
@@ -1018,10 +1020,7 @@ public void unmarkSelectedItemsFeesChangableAtBilling() {
         }
         JsfUtil.addSuccessMessage("All Unmarked as Fees Changable at Billing");
     }
-    
-    
-    
-    
+
     public void markSelectedItemsAsPrintSessionNumber() {
         if (selectedList == null || selectedList.isEmpty()) {
             JsfUtil.addErrorMessage("Nothing is selected");
@@ -1045,7 +1044,6 @@ public void unmarkSelectedItemsAsNotToPrintSessionNumber() {
         }
         JsfUtil.addSuccessMessage("All Marked as Not to Print Session Numbers");
     }
-    
 
     public void unmarkSelectedItemsAsDiscountableAtBilling() {
         if (selectedList == null || selectedList.isEmpty()) {
@@ -1082,7 +1080,7 @@ public void unMarkSelectedItemsForPrintSeparateFees() {
         }
         JsfUtil.addSuccessMessage("All Unmarked for Print Separate Fees");
     }
-    
+
     public void addSessionNumberType() {
         if (selectedList == null || selectedList.isEmpty()) {
             JsfUtil.addErrorMessage("Nothing is selected");
@@ -1160,7 +1158,6 @@ public void setDepartments(List<Department> departments) {
     }
 
     public void createNewItemsFromMasterItems() {
-        ////// // System.out.println("createNewItemsFromMasterItems");
         if (institution == null) {
             JsfUtil.addErrorMessage("Select institution");
             return;
@@ -1174,7 +1171,6 @@ public void createNewItemsFromMasterItems() {
             return;
         }
         for (Item i : selectedList) {
-            ////// // System.out.println("i.getName() = " + i.getName());
             Item ni = null;
             if (i instanceof Investigation) {
                 try {
@@ -1203,13 +1199,9 @@ public void createNewItemsFromMasterItems() {
             ni.setItemFee(null);
             getFacade().create(ni);
             i.setItemFees(itemFeeManager.fillFees(i));
-            ////// // System.out.println("ni = " + ni);
-            ////// // System.out.println("i.getItemFees() = " + i.getItemFees());
-            ////// // System.out.println("ni.getItemFees() = " + ni.getItemFees());
 
             for (ItemFee f : i.getItemFees()) {
                 ItemFee nf = new ItemFee();
-                ////// // System.out.println("f = " + f);
                 try {
                     BeanUtils.copyProperties(nf, f);
                 } catch (IllegalAccessException | InvocationTargetException ex) {
@@ -1225,7 +1217,6 @@ public void createNewItemsFromMasterItems() {
                 nf.setItem(ni);
                 ni.getItemFees().add(nf);
                 getItemFeeFacade().create(nf);
-                ////// // System.out.println("nf = " + nf);
             }
             getFacade().edit(ni);
             List<Item> ifis = itemForItemController.getItemsForParentItem(i);
@@ -1238,7 +1229,6 @@ public void createNewItemsFromMasterItems() {
                     ifin.setCreater(getSessionController().getLoggedUser());
                 }
             }
-            ////// // System.out.println("ni.getItemFees() = " + ni.getItemFees());
         }
     }
 
@@ -1313,7 +1303,6 @@ public List<Item> completeDealorItem(String query) {
                     + " (c.item.barcode) like :q or (c.item.code) like :q )order by c.item.name";
             hm.put("ins", getInstitution());
             hm.put("q", "%" + query + "%");
-            //////// // System.out.println(sql);
             suggestions = getFacade().findByJpql(sql, hm, 20);
         }
         return suggestions;
@@ -1330,7 +1319,6 @@ public List<Item> getDealorItem() {
                 + " order by c.item.name";
         hm.put("ins", getInstitution());
 
-        //////// // System.out.println(sql);
         suggestions = getFacade().findByJpql(sql, hm);
 
         return suggestions;
@@ -1419,24 +1407,6 @@ public List<Item> completeMasterItems(String query) {
 
     public List<Item> completeItem(String query) {
         return completeItem(query, null, null, 20);
-//        List<Item> suggestions;
-//        String sql;
-//        HashMap hm = new HashMap();
-//        if (query == null) {
-//            suggestions = new ArrayList<>();
-//        } else {
-//            sql = "select c from Item c "
-//                    + " where c.retired=false"
-//                    + "  and ((c.name) like :q"
-//                    + "  or (c.barcode) like :q"
-//                    + "  or (c.code) like :q )"
-//                    + " order by c.name";
-//            hm.put("q", "%" + query.toUpperCase() + "%");
-////////// // System.out.println(sql);
-//            suggestions = getFacade().findByJpql(sql, hm, 20);
-//        }
-//        return suggestions;
-//
     }
 
     List<Item> itemList;
@@ -1665,7 +1635,6 @@ public List<Item> fetchStoreItem() {
                 + " (type(c)= :amp) "
                 + " and c.departmentType=:dep "
                 + " order by c.name";
-        //////// // System.out.println(sql);
         tmpMap.put("amp", Amp.class);
         tmpMap.put("dep", DepartmentType.Store);
 
@@ -1688,7 +1657,6 @@ public List<Item> completeAmpAndAmppItem(String query) {
                 sql = "select c from Item c where c.retired=false and (type(c)= :amp or type(c)=:ampp ) and ((c.name) like '%" + query.toUpperCase() + "%' or (c.code) like '%" + query.toUpperCase() + "%') order by c.name";
             }
 
-//////// // System.out.println(sql);
             tmpMap.put("amp", Amp.class);
             tmpMap.put("ampp", Ampp.class);
             suggestions = getFacade().findByJpql(sql, tmpMap, TemporalType.TIMESTAMP, 30);
@@ -1720,18 +1688,21 @@ public List<Item> completeAmpAndVmpItem(String query) {
     }
 
     public List<Item> fillpackages() {
-        List<Item> suggestions;
         String sql;
         sql = "select c from Item c where c.retired=false"
                 + " and (c.inactive=false or c.inactive is null) "
                 + " and type(c)=Packege "
                 + " order by c.name";
-        //////// // System.out.println(sql);
+        //System.out.println("sql = " + sql);
         packaes = getFacade().findByJpql(sql);
         //System.out.println("packaes = " + packaes);
+        if (packaes == null) {
+            return new ArrayList<>();
+        }
         return packaes;
     }
 
+
     public List<Item> completePackage(String query) {
         List<Item> suggestions;
         String sql;
@@ -1742,7 +1713,6 @@ public List<Item> completePackage(String query) {
                     + " and (c.inactive=false or c.inactive is null) "
                     + "and type(c)=Packege "
                     + "and (c.name) like '%" + query.toUpperCase() + "%' order by c.name";
-            //////// // System.out.println(sql);
             suggestions = getFacade().findByJpql(sql);
         }
         return suggestions;
@@ -1920,7 +1890,6 @@ public List<Item> completeInwardItems(String query) {
             m.put("ward", InwardService.class);
             m.put("the", TheatreService.class);
             m.put("q", "%" + query.toUpperCase() + "%");
-            //    //////// // System.out.println(sql);
             suggestions = getFacade().findByJpql(sql, m, 20);
         }
         return suggestions;
@@ -1943,7 +1912,6 @@ public void fillItemsForInward() {
         m.put("inv", Investigation.class);
         m.put("ward", InwardService.class);
         m.put("the", TheatreService.class);
-        //    //////// // System.out.println(sql);
         suggestItems = getFacade().findByJpql(sql, m);
     }
 
@@ -1976,7 +1944,6 @@ public List<Item> completeTheatreItems(String query) {
 //            m.put("inv", Investigation.class);
             m.put("the", TheatreService.class);
             m.put("q", "%" + query.toUpperCase() + "%");
-            //    //////// // System.out.println(sql);
             suggestions = getFacade().findByJpql(sql, m, 20);
         }
         return suggestions;
@@ -2159,10 +2126,8 @@ public List<Item> completeOpdItemsByNamesAndCodeInstitutionSpecificOrNotSpecific
         m.put("inv", Investigation.class);
         m.put("q", "%" + query.toUpperCase() + "%");
 
-//        //// // System.out.println(sql);
-//        //// // System.out.println("m = " + m);
         mySuggestions = getFacade().findByJpql(sql, m, 20);
-//        //// // System.out.println("mySuggestions = " + mySuggestions);
+
         return mySuggestions;
     }
 
@@ -2225,7 +2190,7 @@ public List<Item> completeServicesPlusInvestigationsAll(String query) {
             m.put("ser", Service.class);
             m.put("inv", Investigation.class);
             m.put("q", "%" + query.toUpperCase() + "%");
-            //    //////// // System.out.println(sql);
+
             mySuggestions = getFacade().findByJpql(sql, m, 20);
         }
         return mySuggestions;
@@ -2278,7 +2243,7 @@ public List<Item> completeOpdItemsForItemListringStrategyLoggedInstitution(Strin
             m.put("ins", sessionController.getInstitution());
 
             m.put("q", "%" + query.toUpperCase() + "%");
-            //    //////// // System.out.println(sql);
+
             mySuggestions = getFacade().findByJpql(sql, m, 20);
         }
         return mySuggestions;
@@ -2291,7 +2256,7 @@ public List<Item> completeItemWithoutPackOwn(String query) {
             suggestions = new ArrayList<Item>();
         } else {
             sql = "select c from Item c where c.institution.id = " + getSessionController().getInstitution().getId() + " and c.retired=false and type(c)!=Packege and type(c)!=TimedItem and (c.name) like '%" + query.toUpperCase() + "%' order by c.name";
-            //////// // System.out.println(sql);
+
             suggestions = getFacade().findByJpql(sql);
         }
         return suggestions;
@@ -2299,9 +2264,7 @@ public List<Item> completeItemWithoutPackOwn(String query) {
 
     public void makeSelectedAsMasterItems() {
         for (Item i : selectedList) {
-            ////// // System.out.println("i = " + i.getInstitution());
             if (i.getInstitution() != null) {
-                ////// // System.out.println("i = " + i.getInstitution().getName());
                 i.setInstitution(null);
                 getFacade().edit(i);
             }
@@ -2330,7 +2293,6 @@ public List<Item> fetchOPDItemList(boolean ins) {
         m.put("inw", InwardService.class);
         m.put("ser", Service.class);
         m.put("inv", Investigation.class);
-        ////// // System.out.println(sql);
         items = getFacade().findByJpql(sql, m);
         return items;
     }
@@ -2362,7 +2324,7 @@ public List<ItemFee> fetchOPDItemFeeList(boolean ins, FeeType ftype) {
         m.put("inw", InwardService.class);
         m.put("ser", Service.class);
         m.put("inv", Investigation.class);
-        ////// // System.out.println(sql);
+
         itemFees = getItemFeeFacade().findByJpql(sql, m);
         return itemFees;
     }
@@ -3052,14 +3014,12 @@ public Department getFilterDepartment() {
 
     public void setFilterDepartment(Department filterDepartment) {
         this.filterDepartment = filterDepartment;
-
     }
 
     public List<Item> getPackaes() {
         if (packaes == null) {
             packaes = fillpackages();
         }
-        // System.out.println("getPackaes = " + packaes);   
         return packaes;
     }
 
@@ -3075,6 +3035,14 @@ public void setSuggestItems(List<Item> suggestItems) {
         this.suggestItems = suggestItems;
     }
 
+    public Sex getPatientGender() {
+        return patientGender;
+    }
+
+    public void setPatientGender(Sex patientGender) {
+        this.patientGender = patientGender;
+    }
+
     @FacesConverter("itemLightConverter")
     public static class ItemLightConverter implements Converter {
 
diff --git a/src/main/java/com/divudi/entity/Item.java b/src/main/java/com/divudi/entity/Item.java
index 6f32cccd5c..4e025c8647 100644
--- a/src/main/java/com/divudi/entity/Item.java
+++ b/src/main/java/com/divudi/entity/Item.java
@@ -1398,6 +1398,9 @@ public void setCanRemoveItemfromPackage(boolean canRemoveItemfromPackage) {
     }
 
     public String getForGender() {
+        if(forGender==null||forGender.trim().equals("")){
+            forGender = "Both";
+        }
         return forGender;
     }
 
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 42fe5625f4..6d8623993e 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -2,14 +2,14 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
 
-        <jta-data-source>jdbc/hims</jta-data-source>
+        <jta-data-source>jdbc/arogya</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <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/himsAduit</jta-data-source>
+        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
         </properties>
diff --git a/src/main/webapp/admin/pricing/package_name.xhtml b/src/main/webapp/admin/pricing/package_name.xhtml
index 8c18479dac..74e689512c 100644
--- a/src/main/webapp/admin/pricing/package_name.xhtml
+++ b/src/main/webapp/admin/pricing/package_name.xhtml
@@ -91,6 +91,7 @@
                                         id="cmbSex"
                                         value="#{packageNameController.current.forGender}"
                                         class="w-100">
+                                         <f:selectItem itemLabel="Select"  />
                                         <f:selectItem itemLabel="Both"  itemValue="Both"/>
                                         <f:selectItem itemLabel="Male" itemValue="Male"/>
                                         <f:selectItem itemLabel="Female" itemValue="Female"/>
diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml
index aed333c8ee..abcdba8ea6 100644
--- a/src/main/webapp/opd/opd_bill_package.xhtml
+++ b/src/main/webapp/opd/opd_bill_package.xhtml
@@ -9,7 +9,8 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:ez="http://xmlns.jcp.org/jsf/composite/ezcomp"
                 xmlns:pa="http://xmlns.jcp.org/jsf/composite/paymentMethod"
-                xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common">
+                xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
     >
 
     <ui:define name="content">
@@ -39,7 +40,377 @@
 
                                     <h:panelGrid columns="1" class="w-100">
                                         <h:panelGroup id="panelIx" class="w-100">
-                                            <common:patient_details controller="#{billPackageController}" searchable="true" editable="true"/>
+                                            <p:panel id="ptImp">
+                                                
+                                                <f:facet name="header">
+                                                    <h:panelGroup layout="block" styleClass="d-flex justify-content-between align-items-center">
+                                                        <!-- Left aligned content -->
+                                                        <h:panelGroup id="headerFacet">
+                                                            <h:outputText value="Select a Patient" rendered="#{billPackageController.patient eq null}"></h:outputText>
+                                                            <h:outputText styleClass="fas fa-user" />
+                                                            <h:panelGroup 
+                                                                rendered="#{patientController.quickSearchPatientList eq null or empty patientController.quickSearchPatientList}">
+                                                                <h:outputText
+                                                                    rendered="#{billPackageController.patient.id eq null}"
+                                                                    value="Patient" 
+                                                                    class="mx-4"
+                                                                    >
+                                                                </h:outputText>
+                                                                <h:outputText
+                                                                    rendered="#{billPackageController.patient.id ne null}"
+                                                                    value="Searched Patient Details" 
+                                                                    class="mx-2"
+                                                                    ></h:outputText>
+                                                                <h:panelGroup rendered="true" id="edit" >
+                                                                    <p:selectBooleanButton 
+                                                                        value="#{billPackageController.patientDetailsEditable}" 
+                                                                        offIcon="pi pi-pencil" 
+                                                                        onIcon="pi pi-eye"                                 
+                                                                        class="mx-2"
+                                                                        >
+                                                                        <p:ajax 
+                                                                            process="@this" 
+                                                                            update="viewPatient editPatient btnDone edit" />
+                                                                    </p:selectBooleanButton>
+                                                                    <p:commandButton id="btnDone" alt="Save Patient Details" class="ui-button-success" icon="fas fa-check" action="#{patientController.saveSelected(billPackageController.patient)}" rendered="#{billPackageController.patientDetailsEditable}" update=":#{p:resolveFirstComponentWithId('ptImp',view).clientId} " />
+                                                                </h:panelGroup>
+
+                                                            </h:panelGroup>
+                                                        </h:panelGroup>
+
+                                                        <!-- Right aligned quick search -->
+                                                        <h:panelGroup id="quickSearch" >
+                                                            <h:panelGroup rendered="true" layout="block"  styleClass="form-inline">
+                                                                <p:focus  for="txtQuickSearchPhoneNumber" />
+                                                                <p:inputText 
+                                                                    autocomplete="off"
+                                                                    id="txtQuickSearchPhoneNumber"
+                                                                    value="#{patientController.quickSearchPhoneNumber}"
+                                                                    placeholder="Phone Number"
+                                                                    class="form-control-sm mx-1"
+                                                                    onfocus="this.select()" 
+                                                                    />
+                                                                <p:commandButton 
+                                                                    id="btnSearchbyPhoneNo"
+                                                                    icon="fa fa-search" 
+                                                                    title="Quick Search from Phone Number"
+                                                                    action="#{patientController.quickSearchPatientLongPhoneNumber(billPackageController)}" 
+                                                                    process="btnSearchbyPhoneNo txtQuickSearchPhoneNumber"
+                                                                    update="ptImp selectPatient editPatient viewPatient advanced"
+                                                                    styleClass="btn-sm mx-1">
+                                                                </p:commandButton>
+                                                                <p:defaultCommand target="btnSearchbyPhoneNo"> </p:defaultCommand>
+                                                                <p:commandButton 
+                                                                    id="btnAddNewPatient"
+                                                                    icon="fa fa-plus-circle" 
+                                                                    title="Add New Patient"
+                                                                    action="#{patientController.quickSearchNewPatient(billPackageController)}" 
+                                                                    process="btnAddNewPatient"
+                                                                    update="ptImp selectPatient editPatient viewPatient"
+                                                                    styleClass="btn-sm mx-1"/>
+                                                            </h:panelGroup>
+                                                        </h:panelGroup>
+                                                    </h:panelGroup>
+                                                </f:facet>
+
+                                                <h:panelGroup id="selectPatient" >
+                                                    <h:panelGroup rendered="#{patientController.quickSearchPatientList ne null and not empty patientController.quickSearchPatientList}">
+                                                        <p:dataTable id="tblPatients" value="#{patientController.quickSearchPatientList}" var="ps">
+                                                            <p:column headerText="Name">
+                                                                #{ps.person.name}
+                                                            </p:column>
+                                                            <p:column headerText="Phone Number">
+                                                                #{ps.person.phone}
+                                                            </p:column>
+                                                            <p:column headerText="Mobile Number">
+                                                                #{ps.person.mobile}
+                                                            </p:column>
+                                                            <p:column>
+                                                                <p:commandButton 
+                                                                    action="#{patientController.selectQuickOneFromQuickSearchPatient(billPackageController)}" 
+                                                                    id="btnSelectPt"
+                                                                    process="btnSelectPt tblPatients"
+                                                                    update=":#{p:resolveFirstComponentWithId('ptImp',view).clientId} :#{p:resolveFirstComponentWithId('advanced',view).clientId}"
+                                                                    value="select">
+                                                                    <f:setPropertyActionListener value="#{ps}" target="#{patientController.current}" />
+                                                                </p:commandButton>
+                                                            </p:column>
+                                                        </p:dataTable>
+                                                    </h:panelGroup>
+                                                </h:panelGroup>
+
+                                                <h:panelGroup id="editPatient" >
+
+                                                    <h:panelGroup rendered="#{billPackageController.patientDetailsEditable}" >
+                                                        <h:panelGroup rendered="#{patientController.quickSearchPatientList eq null or empty patientController.quickSearchPatientList}">
+                                                            <h:panelGroup class="mb-1 w-100" id="panelPatient" >
+                                                                <h:panelGroup id="gpPatient" >
+                                                                    <div class="row">
+                                                                        <div class="col-md-3 p-1">
+                                                                            <p:selectOneMenu 
+                                                                                id="cmbTitle"
+                                                                                class="form-control w-100"
+                                                                                requiredMessage="Please enter a title"
+                                                                                value="#{billPackageController.patient.person.title}">
+                                                                                <f:selectItem itemLabel="Select Title" />
+                                                                                <f:selectItems value="#{opdBillController.title}" var="i"
+                                                                                               itemLabel="#{i.label}" itemValue="#{i}"/>
+                                                                                <p:ajax event="change" process="cmbTitle" update="cmbSex" ></p:ajax>
+                                                                            </p:selectOneMenu>
+                                                                        </div>
+                                                                        <div class="col-md-9 p-1">
+                                                                            <p:inputText 
+
+                                                                                requiredMessage="Please enter a name for the patient"
+                                                                                autocomplete="off" 
+                                                                                id="txtNewPtName" 
+                                                                                placeholder="Enter the Name of the patient"
+                                                                                value="#{billPackageController.patient.person.name}"
+                                                                                validatorMessage="Please enter only letters and spaces."
+                                                                                class="form-control" >
+                                                                                <c:if test="#{not empty sessionController.applicationPreference.nameRegex}">
+                                                                                    <f:validateRegex pattern="#{sessionController.applicationPreference.nameRegex}"/>
+                                                                                </c:if>
+
+                                                                            </p:inputText>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="row">
+                                                                        <div class="col-md-3 p-1">
+                                                                            <p:selectOneMenu 
+                                                                                id="cmbSex" 
+
+                                                                                requiredMessage="Please select a gender"
+                                                                                value="#{billPackageController.patient.person.sex}"
+                                                                                class="form-control w-100">
+                                                                                <f:selectItem itemLabel="Select Gender"/>
+                                                                                <f:selectItems value="#{opdBillController.sex}"/>
+                                                                                <p:ajax process="cmbSex" update="advanced" ></p:ajax>
+                                                                                <p:ajax event="blur" process="cmbSex" update="advanced" ></p:ajax>
+                                                                                <p:ajax event="change" process="cmbSex" update="advanced" ></p:ajax>
+                                                                            </p:selectOneMenu>
+                                                                        </div>
+                                                                        <div class="col-md-9 p-1">
+                                                                            <div class="row">
+                                                                                <div class="col-md-2">
+                                                                                    <p:inputText 
+                                                                                        autocomplete="off" 
+                                                                                        id="year" 
+                                                                                        placeholder="Years"
+                                                                                        onfocus="this.select();"
+                                                                                        value="#{billPackageController.patient.person.ageYearsComponent}"
+                                                                                        class="form-control">
+                                                                                        <f:ajax event="keyup" execute="@this" render="dpDob" />
+                                                                                    </p:inputText>
+                                                                                </div>
+                                                                                <div class="col-md-2">
+                                                                                    <p:inputText
+                                                                                        onfocus="this.select();"
+                                                                                        autocomplete="off" id="month" placeholder="Months"
+                                                                                        value="#{billPackageController.patient.person.ageMonthsComponent}"
+                                                                                        class="form-control">
+                                                                                        <f:ajax event="keyup" execute="@this"  render="dpDob"  />
+                                                                                    </p:inputText>
+                                                                                </div>
+                                                                                <div class="col-md-2">
+                                                                                    <p:inputText 
+                                                                                        onfocus="this.select();"
+                                                                                        autocomplete="off" id="day" placeholder="Days"
+                                                                                        value="#{billPackageController.patient.person.ageDaysComponent}"
+                                                                                        class="form-control">
+                                                                                        <f:ajax event="keyup" execute="@this"  render="dpDob" />
+                                                                                    </p:inputText>
+                                                                                </div>
+                                                                                <div class="col-md-6">
+                                                                                    <p:datePicker  
+                                                                                        value="#{billPackageController.patient.person.dob}"
+                                                                                        id="dpDob" 
+                                                                                        class="w-100"
+                                                                                        yearNavigator="true"
+                                                                                        monthNavigator="true"
+                                                                                        inputStyleClass="form-control"
+                                                                                        requiredMessage="Please select a date of birth"
+                                                                                        pattern="#{sessionController.applicationPreference.longDateFormat}"
+                                                                                        placeholder="Date of Birth (dd/mm/yyyy)"
+                                                                                        >
+                                                                                        <p:ajax event="dateSelect" process="@this" update="year month day" />
+                                                                                    </p:datePicker>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="row">
+                                                                        <div class="col-md-3 p-1">
+                                                                            <p:inputText 
+                                                                                id="txtMobile" 
+                                                                                autocomplete="off" 
+                                                                                placeholder="Mobile Number"
+                                                                                value="#{billPackageController.patient.mobileNumberStringTransient}"
+                                                                                class="form-control" 
+                                                                                requiredMessage="Please enter a Mobile Number"
+                                                                                validatorMessage="Please enter valid Number">
+                                                                                <c:if test="#{not empty sessionController.applicationPreference.mobileRegex}">
+                                                                                    <f:validateRegex pattern="#{sessionController.applicationPreference.mobileRegex}"/>
+                                                                                </c:if>
+                                                                            </p:inputText>
+                                                                        </div>
+                                                                        <div class="col-md-3 p-1">
+                                                                            <p:inputText 
+                                                                                id="txtPhone" 
+                                                                                requiredMessage="Please enter a Phone Number"
+                                                                                autocomplete="off" 
+                                                                                placeholder="Phone Number"
+                                                                                value="#{billPackageController.patient.phoneNumberStringTransient}"
+                                                                                class="form-control" validatorMessage="Please enter valid Number">
+                                                                                <c:if test="#{not empty sessionController.applicationPreference.mobileRegex}">
+                                                                                    <f:validateRegex pattern="#{sessionController.applicationPreference.mobileRegex}"/>
+                                                                                </c:if>
+                                                                            </p:inputText>
+                                                                        </div>
+                                                                        <div class="col-md-3 p-1">
+                                                                            <p:inputText 
+                                                                                requiredMessage="Please enter a Email"
+                                                                                autocomplete="off" id="txtEmail" placeholder="Enter Email here"
+                                                                                value="#{billPackageController.patient.person.email}"
+                                                                                class="form-control"
+                                                                                >
+                                                                                <c:if test="#{not empty sessionController.applicationPreference.emailRegex}">
+                                                                                    <f:validateRegex pattern="#{sessionController.applicationPreference.emailRegex}"/>
+                                                                                </c:if>
+                                                                            </p:inputText>
+                                                                        </div>
+                                                                        <div class="col-md-3 p-1">
+                                                                            <p:inputText 
+                                                                                id="txtNic"
+                                                                                requiredMessage="Please enter a ID"
+                                                                                autocomplete="off"
+                                                                                placeholder="National ID Number"
+                                                                                value="#{billPackageController.patient.person.nic}"
+                                                                                class="form-control"/>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="row">
+                                                                        <div class="col-md-7 p-1">
+                                                                            <p:inputText
+                                                                                id="txtAddress"
+                                                                                autocomplete="off"
+                                                                                requiredMessage="Please enter an Address"
+                                                                                placeholder="Address"
+                                                                                value="#{billPackageController.patient.person.address}"
+                                                                                class="form-control"/>
+                                                                        </div>
+
+                                                                        <h:panelGroup class="col-md-2 p-1" rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}">
+                                                                            <p:selectBooleanButton 
+                                                                                id="scbforigner"
+                                                                                value="#{billPackageController.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"
+                                                                                placeholder="Search &amp; Select Area"
+                                                                                completeMethod="#{areaController.completeArea}"
+                                                                                var="pta" itemLabel="#{pta.name}"
+                                                                                itemValue="#{pta}" forceSelection="true"
+                                                                                value="#{billPackageController.patient.person.area}"
+                                                                                inputStyleClass="form-control"
+                                                                                class="w-100"/>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <p:tooltip for="txtNewPtName" value="Patient Name"  showDelay="0" hideDelay="0"></p:tooltip>
+                                                                    <p:tooltip for="txtNic" value="NIC No"  showDelay="0" hideDelay="0"></p:tooltip>
+                                                                    <p:tooltip for="dpDob" value="Date Of Birth"  showDelay="0" hideDelay="0"></p:tooltip>
+                                                                    <p:tooltip for="txtAddress" value="Address"  showDelay="0" hideDelay="0"></p:tooltip>
+                                                                    <p:tooltip for="txtMobile" value="Mobile Number"  showDelay="0" hideDelay="0"></p:tooltip>
+                                                                    <p:tooltip for="txtPhone" value="Home Phone Number"  showDelay="0" hideDelay="0"></p:tooltip>
+                                                                    <p:tooltip for="cmbSex" value="Sex"  showDelay="0" hideDelay="0"></p:tooltip>
+                                                                    <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>
+
+
+                                                                </h:panelGroup>
+                                                            </h:panelGroup>
+                                                        </h:panelGroup>
+                                                    </h:panelGroup>
+                                                </h:panelGroup>
+                                                <h:panelGroup id="viewPatient" >
+
+                                                    <h:panelGroup  rendered="#{not billPackageController.patientDetailsEditable}"  >
+                                                        <h:panelGroup  rendered="#{patientController.quickSearchPatientList eq null}" >
+                                                            <h:panelGrid columns="3" class="my-1" id="panelPatientDisplay" rendered="#{billPackageController.patient ne null}" >
+                                                                <h:outputLabel value="Name " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.nameWithTitle}" />
+
+                                                                <h:outputLabel value="Gender " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.sex}" />
+
+                                                                <h:outputLabel value="Date of Birth " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.dob}" >
+                                                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" ></f:convertDateTime>
+                                                                </h:outputText>
+
+                                                                <h:outputLabel value="Age  " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.ageAsString}" />
+
+                                                                <h:outputLabel value="Mobile No. " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.mobile}" />
+
+                                                                <h:outputLabel value="Phone No. " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.phone}" />
+
+                                                                <h:outputLabel value="Email " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.email}" />
+
+                                                                <h:outputLabel value="National ID No. " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.patient.person.nic}" />
+
+                                                                <h:outputLabel value="Address " class="mx-3"/>
+                                                                <h:outputLabel value=" : " class="mx-3"/>
+                                                                <h:outputText value="#{billPackageController.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="#{billPackageController.patient.person.foreigner?'Patient is Forigner':'Patient is Local'}" 
+                                                                    severity="#{billPackageController.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="#{billPackageController.patient.person.area.name}" />
+                                                            </h:panelGrid>
+                                                        </h:panelGroup>
+                                                    </h:panelGroup>
+
+                                                </h:panelGroup>
+
+                                            </p:panel>
                                         </h:panelGroup>
                                     </h:panelGrid>
 
@@ -47,39 +418,19 @@
 
                                         <p:panel id='pIxAdd' header="Items Requests"  >  
                                             <f:facet name="header" >
-                                                <h:outputText styleClass="fa-solid fa-circle-plus" /> <!-- FontAwesome Icon -->
+                                                <h:outputText styleClass="fa-solid fa-circle-plus" />
                                                 <h:outputText value="Add New Items" class="mx-4"></h:outputText>
                                             </f:facet>
-
-                                            <!--                                            <p:autoComplete
-                                                                                            widgetVar="aIx" 
-                                                                                            id="acIx"
-                                                                                            forceSelection="true" 
-                                                                                            value="#{billPackageController.currentBillItem.item}"
-                                                                                            completeMethod="#{itemController.completePackage}" 
-                                                                                            var="ix" 
-                                                                                            itemLabel="#{ix.name}"
-                                                                                            itemValue="#{ix}"    
-                                                                                            required="true" requiredMessage="Please add item" size="50" class="mx-2 ">
                                             
-                                                                                            <p:column>
-                                            #{ix.name}
-                                        </p:column>
-                                        <p:column>
-                                            #{ix.total}
-                                        </p:column>
-                                        <p:ajax event="itemSelect" process="acIx" ></p:ajax>
-                                    </p:autoComplete>-->
-
-
                                             <p:selectOneListbox 
                                                 id="advanced" 
                                                 value="#{billPackageController.currentBillItem.item}"
-                                                var="i" 
+                                                var="i"
                                                 filter="true" 
+                                                scrollHeight="250"
                                                 filterMatchMode="contains">
                                                 <f:selectItems 
-                                                    value="#{itemController.packaes}" 
+                                                    value="#{billPackageController.genderBasedPackaes}" 
                                                     var="item" 
                                                     itemLabel="#{item.name}" 
                                                     itemValue="#{item}"/>
@@ -89,6 +440,15 @@
                                                 <p:column>
                                                     <h:outputText value="#{i.department}"/>
                                                 </p:column>
+                                                <p:column rendered="#{configOptionApplicationController.getBooleanValueByKey('Package bill – Reloading of Packages with Consideration of Gender')}">
+                                                    
+                                                    <p:badge 
+                                                        size="large"
+                                                        value="#{i.forGender}" 
+                                                        severity="#{i.forGender eq 'Male'?'info': i.forGender eq 'Female'? 'warning':'success'}"
+                                                        >
+                                                    </p:badge>
+                                                </p:column>
                                                 <p:column>
                                                     <h:outputText value="#{i.total}"/>
                                                 </p:column>
@@ -100,6 +460,7 @@
                                                 process="advanced btnAddIx"
                                                 update="tblBillItem pBillDetails pIxAdd msg"
                                                 icon="fa fa-plus"
+                                                style=""
                                                 class=" mx-1 ui-button-success my-2"
                                                 action="#{billPackageController.addToBill()}" >
                                             </p:commandButton>
@@ -108,118 +469,118 @@
 
                                 </h:panelGroup>
 
-                                <p:panel class="w-100">
-
-                                    <f:facet name="header" >
-                                        <h:outputText styleClass="fa fa-list" /> <!-- FontAwesome Icon -->
-                                        <h:outputText value="Added Items" class="mx-4"></h:outputText>
-                                    </f:facet>
-                                    <p:tabView id="tblBillItem" >
-                                        <p:tab id="pacName" title="Package Name" >
-                                            <div class="d-flex justify-content-between">
-                                                <h:outputLabel  style="font-weight: 500; font-size: 18px;" value="#{billPackageController.currentBillItem.item.name}"/>
-                                                <p:commandButton 
-                                                    id="btnRemove" 
-                                                    value="X" 
-                                                    title="Remove"
-                                                    class="ui-button-danger"
-                                                    rendered="#{billPackageController.currentBillItem.item ne null}" 
-                                                    action="#{billPackageController.removeBillItem}" 
-                                                    ajax="false" />                                                
-                                            </div>
-                                        </p:tab>
-                                        <p:tab id="tabBillItems" title="Bill Items" >
-                                            <p:dataTable 
-                                                id="tblRequests" 
-                                                rowIndexVar="rowIndex" 
-                                                value="#{billPackageController.lstBillEntries}" 
-                                                var="bi" class="w-100" 
-                                                >
+                            </div>
 
-                                                <p:column  style="width: 30px;">
-                                                    <f:facet name="header">No</f:facet>
-                                                        #{rowIndex+1}
-                                                </p:column>
-                                                <p:column>
-                                                    <f:facet name="header">Item</f:facet>
-                                                        #{bi.billItem.item.name}
-                                                </p:column>
-                                                <p:column  style="width: 200px;">
-                                                    <f:facet name="header">Fee</f:facet>
-                                                    <h:outputLabel value="#{bi.billItem.netValue}">
-                                                        <f:convertNumber pattern="#,##0.00" />
-                                                    </h:outputLabel>
-                                                </p:column>
-                                                <p:column  style="width: 200px;">
-                                                    <f:facet name="header">Department</f:facet>
-                                                        #{bi.billItem.item.department.name}
-                                                </p:column>
-                                                <p:column  style="width: 50px;">
+                            <div class="col-md-6">
+                                <div>
+                                    <p:panel class="w-100">
+
+                                        <f:facet name="header" >
+                                            <h:outputText styleClass="fa fa-list" /> <!-- FontAwesome Icon -->
+                                            <h:outputText value="Added Items" class="mx-4"></h:outputText>
+                                        </f:facet>
+                                        <p:tabView id="tblBillItem" >
+                                            <p:tab id="pacName" title="Package Name" >
+                                                <div class="d-flex justify-content-between">
+                                                    <h:outputLabel  style="font-weight: 500; font-size: 18px;" value="#{billPackageController.currentBillItem.item.name}"/>
                                                     <p:commandButton 
                                                         id="btnRemove" 
                                                         value="X" 
                                                         title="Remove"
-                                                        disabled="#{!bi.billItem.item.canRemoveItemfromPackage}"
                                                         class="ui-button-danger"
                                                         rendered="#{billPackageController.currentBillItem.item ne null}" 
-                                                        action="#{billPackageController.removeBillItem(bi.billItem.item)}" 
-                                                        process="@this"
-                                                        update=":#{p:resolveFirstComponentWithId('tblBillItem',view).clientId} :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId}" />  
-                                                </p:column>
+                                                        action="#{billPackageController.removeBillItem}" 
+                                                        ajax="false" />                                                
+                                                </div>
+                                            </p:tab>
+                                            <p:tab id="tabBillItems" title="Bill Items" >
+                                                <p:dataTable 
+                                                    id="tblRequests" 
+                                                    rowIndexVar="rowIndex" 
+                                                    value="#{billPackageController.lstBillEntries}" 
+                                                    var="bi" class="w-100" 
+                                                    >
 
-                                            </p:dataTable>
-                                        </p:tab>
-                                        <p:tab id="tabBillIx" title="Tests" >
-                                            <p:dataTable rowIndexVar="rowIndex" value="#{billPackageController.lstBillComponents}" var="bix" >
-                                                <p:column  style="width: 30px;">
-                                                    <f:facet name="header">No</f:facet>
-                                                        #{rowIndex+1}
-                                                </p:column>
-                                                <p:column>
-                                                    <f:facet name="header">Name</f:facet>
-                                                        #{bix.item.name}
-                                                </p:column>
+                                                    <p:column  style="width: 30px;">
+                                                        <f:facet name="header">No</f:facet>
+                                                            #{rowIndex+1}
+                                                    </p:column>
+                                                    <p:column>
+                                                        <f:facet name="header">Item</f:facet>
+                                                            #{bi.billItem.item.name}
+                                                    </p:column>
+                                                    <p:column  style="width: 200px;">
+                                                        <f:facet name="header">Fee</f:facet>
+                                                        <h:outputLabel value="#{bi.billItem.netValue}">
+                                                            <f:convertNumber pattern="#,##0.00" />
+                                                        </h:outputLabel>
+                                                    </p:column>
+                                                    <p:column  style="width: 200px;">
+                                                        <f:facet name="header">Department</f:facet>
+                                                            #{bi.billItem.item.department.name}
+                                                    </p:column>
+                                                    <p:column  style="width: 50px;">
+                                                        <p:commandButton 
+                                                            id="btnRemove" 
+                                                            value="X" 
+                                                            title="Remove"
+                                                            disabled="#{!bi.billItem.item.canRemoveItemfromPackage}"
+                                                            class="ui-button-danger"
+                                                            rendered="#{billPackageController.currentBillItem.item ne null}" 
+                                                            action="#{billPackageController.removeBillItem(bi.billItem.item)}" 
+                                                            process="@this"
+                                                            update=":#{p:resolveFirstComponentWithId('tblBillItem',view).clientId} :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId}" />  
+                                                    </p:column>
 
-                                            </p:dataTable>
-                                        </p:tab>
-                                        <p:tab id="tabBillFee" title="Fees" >
-                                            <p:dataTable rowIndexVar="rowIndex" value="#{billPackageController.lstBillFees}" var="bif" >
-                                                <p:column style="width: 30px;">
-                                                    <f:facet name="header">No</f:facet>
-                                                        #{rowIndex+1}
-                                                </p:column>
-                                                
-                                                <p:column >
-                                                    <f:facet name="header">Item </f:facet>
-                                                    <h:outputLabel  value="#{bif.billItem.item.name}"/>
-                                                </p:column>
-                                                
-                                                <p:column style="width: 200px;">
-                                                    <f:facet name="header">Fee</f:facet>
-                                                    <p:inputText autocomplete="off" id="txtFeeVal" value="#{bif.feeValue}" disabled="#{!bif.billItem.item.userChangable}" >
-                                                        <f:convertNumber pattern="#,##0.00" />
-                                                        <f:ajax event="keyup" execute="txtFeeVal" render=" :#{p:resolveFirstComponentWithId('tblRequests',view).clientId}  :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId}" listener="#{billPackageController.feeChanged}" />
-                                                    </p:inputText>
-                                                </p:column>
-                                                <p:column style="width: 200px;">
-                                                    <f:facet name="header">Payee</f:facet>
-                                                    <h:outputLabel value="#{bif.department.name}" rendered="#{bif.department!=null}" ></h:outputLabel>
-                                                    <h:outputLabel value="#{bif.staff.person.name}" rendered="#{bif.staff!=null and bif.fee.speciality==null}" ></h:outputLabel>
-
-                                                    <p:selectOneMenu value="#{bif.staff}" rendered="#{bif.fee.speciality!=null}" >
-                                                        <f:selectItem itemLabel="Select Staff" />
-                                                        <f:selectItems  value="#{staffController.getSpecialityStaff(bif.fee.speciality) }" var="bifs" itemLabel="#{bifs.person.name}" itemValue="#{bifs}" />
-                                                    </p:selectOneMenu>
-                                                </p:column>
-                                            </p:dataTable>
-                                        </p:tab>
-                                    </p:tabView>
-                                </p:panel>
+                                                </p:dataTable>
+                                            </p:tab>
+                                            <p:tab id="tabBillIx" title="Tests" >
+                                                <p:dataTable rowIndexVar="rowIndex" value="#{billPackageController.lstBillComponents}" var="bix" >
+                                                    <p:column  style="width: 30px;">
+                                                        <f:facet name="header">No</f:facet>
+                                                            #{rowIndex+1}
+                                                    </p:column>
+                                                    <p:column>
+                                                        <f:facet name="header">Name</f:facet>
+                                                            #{bix.item.name}
+                                                    </p:column>
 
-                            </div>
+                                                </p:dataTable>
+                                            </p:tab>
+                                            <p:tab id="tabBillFee" title="Fees" >
+                                                <p:dataTable rowIndexVar="rowIndex" value="#{billPackageController.lstBillFees}" var="bif" >
+                                                    <p:column style="width: 30px;">
+                                                        <f:facet name="header">No</f:facet>
+                                                            #{rowIndex+1}
+                                                    </p:column>
+
+                                                    <p:column >
+                                                        <f:facet name="header">Item </f:facet>
+                                                        <h:outputLabel  value="#{bif.billItem.item.name}"/>
+                                                    </p:column>
+
+                                                    <p:column style="width: 200px;">
+                                                        <f:facet name="header">Fee</f:facet>
+                                                        <p:inputText autocomplete="off" id="txtFeeVal" value="#{bif.feeValue}" disabled="#{!bif.billItem.item.userChangable}" >
+                                                            <f:convertNumber pattern="#,##0.00" />
+                                                            <f:ajax event="keyup" execute="txtFeeVal" render=" :#{p:resolveFirstComponentWithId('tblRequests',view).clientId}  :#{p:resolveFirstComponentWithId('pBillDetails',view).clientId}" listener="#{billPackageController.feeChanged}" />
+                                                        </p:inputText>
+                                                    </p:column>
+                                                    <p:column style="width: 200px;">
+                                                        <f:facet name="header">Payee</f:facet>
+                                                        <h:outputLabel value="#{bif.department.name}" rendered="#{bif.department!=null}" ></h:outputLabel>
+                                                        <h:outputLabel value="#{bif.staff.person.name}" rendered="#{bif.staff!=null and bif.fee.speciality==null}" ></h:outputLabel>
+
+                                                        <p:selectOneMenu value="#{bif.staff}" rendered="#{bif.fee.speciality!=null}" >
+                                                            <f:selectItem itemLabel="Select Staff" />
+                                                            <f:selectItems  value="#{staffController.getSpecialityStaff(bif.fee.speciality) }" var="bifs" itemLabel="#{bifs.person.name}" itemValue="#{bifs}" />
+                                                        </p:selectOneMenu>
+                                                    </p:column>
+                                                </p:dataTable>
+                                            </p:tab>
+                                        </p:tabView>
+                                    </p:panel>
 
-                            <div class="col-md-6">
-                                <div>
                                     <div>
                                         <p:panel class="mt-1">
                                             <f:facet name="header" >
@@ -236,18 +597,7 @@
                                                                 listener="#{billPackageController.listnerForPaymentMethodChange}"/>
                                                     </p:selectOneMenu>
                                                 </div>
-                                                <div class="col-6">
-                                                    <!--                                                    <div>
-                                                                                                            <p:commandButton value="Settle" action="#{billPackageController.settleBill}" ajax="false"  class="mx-2">
-                                                                                                            </p:commandButton>
-                                                                                                            <p:commandButton 
-                                                                                                                value="New Bill" 
-                                                                                                                ajax="false" 
-                                                                                                                action="opd_bill_package" 
-                                                                                                                actionListener="#{billPackageController.prepareNewBill()}" >
-                                                                                                            </p:commandButton>
-                                                                                                            <p:defaultCommand target="btnAddIx" />
-                                                                                                        </div>-->
+                                                <div class="col-6 d-flex justify-content-end">
                                                     <h:panelGrid columns="3" >
                                                         <p:commandButton  
                                                             value="Settle"
@@ -264,7 +614,6 @@
                                                             ajax="false"
                                                             icon="fa fa-search"
                                                             class="ui-button-warning mx-1" 
-
                                                             >
                                                         </p:commandButton>
                                                         <p:commandButton 
@@ -623,16 +972,7 @@
                                                 </h:outputText>
                                             </div>
                                         </div>
-                                        <!--                                        <div class="row">
-                                                                                    <div class="col-6">
-                                                                                        <h:outputText value="VAT" class="h5"></h:outputText>
-                                                                                    </div>
-                                                                                    <div class="col-5">
-                                                                                        <h:outputText id="netTotalVat" value="#{billPackageController.netTotal}" >
-                                                                                        <f:convertNumber pattern="#,##0.00" />
-                                                                                    </h:outputText>
-                                                                                    </div>
-                                                                                </div>-->
+
                                         <h:panelGroup rendered="#{billPackageController.paymentMethod eq 'Cash'}">
                                             <div class="row">
                                                 <div class="col-6">
@@ -640,7 +980,6 @@
                                                 </div>
                                                 <div class="col-5">
                                                     <p:inputText autocomplete="off"  id="paid" value="#{billPackageController.cashPaid}" class="h5">
-                                                        <!--<p:ajax process="netTotal paid" update="balance" event="change"/>-->
                                                         <p:ajax event="keyup" process="netTotal paid" update="balance netTotal" listener="#{billPackageController.calTotals()}"/>
                                                     </p:inputText>
                                                 </div>