Merge branch 'Issue#8665' of https://github.com/hmislk/hmis.git into …

…Issue#8670
hmislk · Nov 9, 2024 · c3ec620 · c3ec620
2 parents 58c0af6 + f4dbbb7
commit c3ec620
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 15 deletions.
diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java
@@ -3645,7 +3645,10 @@ public void addChannelBooking(boolean reservedBooking) {
 
         }
 
-        sendSmsAfterBooking();
+        boolean sendSmsAfterBooking = configOptionApplicationController.getBooleanValueByKey("Send SMS after Channel Booking", true);
+        if (sendSmsAfterBooking) {
+            sendSmsAfterBooking();
+        }
 
         if (selectedSessionInstance.isStarted()) {
             sendChannellingStatusUpdateNotificationSms(printingBill.getSingleBillSession());

diff --git a/src/main/java/com/divudi/bean/common/BillPackageController.java b/src/main/java/com/divudi/bean/common/BillPackageController.java
@@ -1558,6 +1558,10 @@ public List<Item> getPackaes() {
 
     private List<Item> listOfTheNonExpiredPackages;
 
+    public void reloadPackages(){
+        itemController.reloadItems();
+    }
+
     private void fillPackages() {
         packaes = itemController.getPackaes();
         if (packaes == null) {

diff --git a/src/main/java/com/divudi/bean/common/ItemController.java b/src/main/java/com/divudi/bean/common/ItemController.java
@@ -3202,6 +3202,12 @@ public List<ItemLight> fillItemsByInstitution(Institution institution) {
 
         return insItems;
     }
+
+    public void reloadItems(){
+        departmentItems=null;
+        institutionItems=null;
+        packaes=null;
+    }
 
     public List<ItemLight> getDepartmentItems() {
         if (departmentItems == null) {

diff --git a/src/main/java/com/divudi/bean/inward/BillBhtController.java b/src/main/java/com/divudi/bean/inward/BillBhtController.java
@@ -153,7 +153,7 @@ public class BillBhtController implements Serializable {
 
     private List<ItemLight> inwardItems;
     private ItemLight itemLight;
-    
+
     public String navigateToAddServiceFromMenu() {
         resetBillData();
         return "/inward/inward_bill_service?faces-redirect=true";
@@ -164,7 +164,7 @@ public String navigateToPrintLabelsForInvestigations() {
         stickers = convertJsonToList(json);
         return "/inward/inward_bill_service_investigation_label_print?faces-redirect=true";
     }
-    
+
     public String navigateToNewBillFromPrintLabelsForInvestigations() {
         resetBillData();
         return "/inward/inward_bill_service?faces-redirect=true";
@@ -500,7 +500,6 @@ public void settleBill() {
         paymentMethod = null;
         settleBill(getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge().getDepartment(), getPatientEncounter().getPaymentMethod());
 
-
     }
 
     public void settleBillSurgery() {
@@ -530,7 +529,6 @@ public void settleBillSurgery() {
         getBillBean().saveEncounterComponents(getBills(), batchBill, getSessionController().getLoggedUser());
         getBillBean().updateBatchBill(getBatchBill());
 
-
     }
 
     @EJB
@@ -710,14 +708,14 @@ public void addToBill() {
         if (errorCheckForPatientRoomDepartment()) {
             return;
         }
-                
+
         for (BillEntry bi : lstBillEntries) {
             if (bi.getBillItem() != null && getCurrentBillItem() != null && getCurrentBillItem().getItem() != null && bi.getBillItem().getItem().equals(getCurrentBillItem().getItem())) {
                 JsfUtil.addErrorMessage("Can't select same item " + getCurrentBillItem().getItem());
                 return;
             }
         }
-        
+
         if (getCurrentBillItem().getQty() == null) {
             getCurrentBillItem().setQty(1.0);
         }
@@ -1282,6 +1280,12 @@ public List<ItemLight> getInwardItems() {
         return inwardItems;
     }
 
+    public void reloadItemLights() {
+        itemApplicationController.reloadItems();
+        itemController.reloadItems();
+        fillInwardItems();
+    }
+
     public void setInwardItems(List<ItemLight> inwardItems) {
         this.inwardItems = inwardItems;
     }

diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java
@@ -4408,6 +4408,7 @@ public void fillDepartmentOpdItems() {
         departmentOpdItems = null;
         opdItems = null;
         itemApplicationController.reloadItems();
+        itemController.reloadItems();
         getDepartmentOpdItems();
     }
 

diff --git a/src/main/webapp/analytics/bills.xhtml b/src/main/webapp/analytics/bills.xhtml
@@ -186,7 +186,12 @@
                                 <p:column rendered="#{webUserController.hasPrivilege('Developers')}" headerText="Bill ID" sortBy="#{bill.id}" filterBy="#{bill.id}" filterMatchMode="contains" >                                
                                     <h:outputLabel value="#{bill.id}"/>
                                 </p:column>
-                                <p:column headerText="Bill No" sortBy="#{bill.deptId}" filterBy="#{bill.deptId}" filterMatchMode="contains" >                                
+                                <p:column rendered="#{webUserController.hasPrivilege('Developers')}" headerText="Ins ID" sortBy="#{bill.insId}" filterBy="#{bill.insId}" filterMatchMode="contains" >                                
+                                    <h:outputLabel value="#{bill.insId}"/>
+                                </p:column>
+                                <p:column
+                                    headerText="Bill No" sortBy="#{bill.deptId}" filterBy="#{bill.deptId}" 
+                                          filterMatchMode="contains" >                                
                                     <h:outputLabel value="#{bill.deptId}"/>
                                 </p:column>
                                 <p:column headerText="Bill Class" >                                
@@ -203,7 +208,7 @@
                                 <p:column headerText="User">
                                     <h:outputText value="#{bill.creater.name}" ></h:outputText>
                                 </p:column>
-                                <p:column headerText="Status">
+                                <p:column headerText="Status" exportable="false">
                                     <h:panelGroup>
                                         <p:badge value="Retired" styleClass="ui-badge-info" rendered="#{bill.retired}" />
                                         <p:badge value="Cancelled" styleClass="ui-badge-danger" rendered="#{bill.cancelled}" />

diff --git a/src/main/webapp/inward/inward_bill_service.xhtml b/src/main/webapp/inward/inward_bill_service.xhtml
@@ -276,6 +276,13 @@
                                                     <div class="row m-1">
                                                         <div class="col-4">
                                                             <h:outputLabel value="Investigation or Service"/>
+                                                            <p:commandButton 
+                                                                ajax="false" 
+                                                                action="#{billBhtController.reloadItemLights()}" 
+                                                                title="Reload"
+                                                                styleClass="ui-button-warning d-block text-start p-1 m-1" 
+                                                                icon="fa fa-refresh"> 
+                                                            </p:commandButton>
                                                         </div>
                                                         <div class="col-8">
                                                             <p:selectOneListbox 
@@ -299,6 +306,7 @@
                                                                 </p:column>  
                                                                 <p:ajax process="itm" update="gpQtyLbl gpQtyTxt" />
                                                             </p:selectOneListbox>
+
                                                         </div>
                                                     </div>
 

diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml
@@ -458,7 +458,7 @@
 
                                             <p:commandButton 
                                                 id="btnAddIx" 
-                                                value="Add" 
+                                                value="Add Package" 
                                                 process="advanced btnAddIx"
                                                 update="tblBillItem pBillDetails pIxAdd msg"
                                                 icon="fa fa-plus"

diff --git a/src/main/webapp/resources/ezcomp/bmsChannelBill.xhtml b/src/main/webapp/resources/ezcomp/bmsChannelBill.xhtml
@@ -365,7 +365,7 @@
 
                 <tr>
                     <td>
-                        <h:outputLabel value="Bill At" ></h:outputLabel>
+                        <h:outputLabel value="Booking At" ></h:outputLabel>
                     </td>
                     <td>
                         <p:spacer width="10" ></p:spacer>
@@ -379,10 +379,40 @@
                         </h:outputLabel>
                     </td>
                 </tr>
-
                 <tr>
                     <td>
-                        <h:outputLabel value="Cashier Name" ></h:outputLabel>
+                        <h:outputLabel value="Booked by" ></h:outputLabel>
+                    </td>
+                    <td>
+                        <p:spacer width="10" ></p:spacer>
+                    </td>
+                    <td>
+                        <h:outputLabel value=":" ></h:outputLabel>
+                    </td>
+                    <td>
+                        <h:outputLabel value="#{cc.attrs.bill.creater.webUserPerson.name}"  ></h:outputLabel>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <h:outputLabel value="Paid At" ></h:outputLabel>
+                    </td>
+                    <td>
+                        <p:spacer width="10" ></p:spacer>
+                    </td>
+                    <td>
+                        <h:outputLabel value=":" ></h:outputLabel>
+                    </td>
+                    <td>
+                        <h:outputLabel value="#{cc.attrs.bill.paidBill.createdAt}">
+                            <f:convertDateTime pattern="dd MM yy hh:mm a" ></f:convertDateTime>
+                        </h:outputLabel>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <h:outputLabel value="Cashier:" ></h:outputLabel>
                     </td>
                     <td>
                         <p:spacer width="10" ></p:spacer>
@@ -391,11 +421,12 @@
                         <h:outputLabel value=":" ></h:outputLabel>
                     </td>
                     <td>
-                        <h:outputLabel value="#{cc.attrs.bill.creater.webUserPerson.name}" rendered="#{cc.attrs.bill.paidBill eq null}" ></h:outputLabel>
-                        <h:outputLabel value="#{cc.attrs.bill.paidBill.creater.name}" rendered="#{cc.attrs.bill.paidBill ne null}" ></h:outputLabel>
+                        <h:outputLabel value="#{cc.attrs.bill.paidBill.creater.name}"  ></h:outputLabel>
                     </td>
                 </tr>
 
+
+
                 <tr>
                     <td>
                         <h:outputLabel value="Cashier Sign" ></h:outputLabel>