Issue#9822 discount report (#9954)

* added batch cancel and refund * changed column width --------- Co-authored-by: imexh <chandikaranawella@gmail.com>
hmislk · Jan 6, 2025 · dcfb2ee · dcfb2ee
1 parent d091400
commit dcfb2ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java
@@ -3686,16 +3686,22 @@ public void generateDiscountReport() {
             opdBts.add(BillTypeAtomic.INWARD_SERVICE_BILL_CANCELLATION);
             opdBts.add(BillTypeAtomic.INWARD_FINAL_BILL);
         } else if (visitType.equalsIgnoreCase("OP")) {
-            opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT);
-            opdBts.add(BillTypeAtomic.OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER);
-            opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT);
-            opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_PAYMENT_COLLECTION_AT_CASHIER);
+            opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_WITH_PAYMENT);
             opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_WITH_PAYMENT);
             opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER);
-            opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_CANCELLATION);
-            opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION);
             opdBts.add(BillTypeAtomic.PACKAGE_OPD_BATCH_BILL_CANCELLATION);
             opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_CANCELLATION);
+            opdBts.add(BillTypeAtomic.PACKAGE_OPD_BILL_REFUND);
+
+            opdBts.add(BillTypeAtomic.OPD_BILL_WITH_PAYMENT);
+            opdBts.add(BillTypeAtomic.OPD_BILL_CANCELLATION);
+            opdBts.add(BillTypeAtomic.OPD_BILL_REFUND);
+
+            opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_WITH_PAYMENT);
+            opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_CANCELLATION);
+
+            opdBts.add(BillTypeAtomic.OPD_BILL_PAYMENT_COLLECTION_AT_CASHIER);
+            opdBts.add(BillTypeAtomic.OPD_BATCH_BILL_PAYMENT_COLLECTION_AT_CASHIER);
         }
 
         if (reportType.equalsIgnoreCase("detail")) {

diff --git a/src/main/webapp/reports/financialReports/discount.xhtml b/src/main/webapp/reports/financialReports/discount.xhtml
@@ -347,7 +347,7 @@
                         <p:column headerText="Visit Type">
                             <h:outputText value="#{row.bill.ipOpOrCc}"/>
                         </p:column>
-                        <p:column headerText="Invoice No">
+                        <p:column headerText="Invoice No" width="13rem">
                             <h:outputText value="#{row.bill.deptId}" rendered="#{row.bill.patientEncounter eq null}"/>
                             <h:outputText value="#{row.bill.patientEncounter.finalBill.deptId}"
                                           rendered="#{row.bill.patientEncounter ne null}"/>
@@ -417,7 +417,7 @@
                         <p:column headerText="Visit Type">
                             <h:outputText value="#{row.billItem.bill.ipOpOrCc}"/>
                         </p:column>
-                        <p:column headerText="Invoice No">
+                        <p:column headerText="Invoice No" width="13rem">
                             <h:outputText value="#{row.billItem.bill.deptId}"
                                           rendered="#{row.billItem.patientEncounter eq null}"/>
                             <h:outputText value="#{row.billItem.bill.patientEncounter.finalBill.deptId}"