Closes #9571

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
hmislk · Dec 21, 2024 · 621893c · 621893c
1 parent 7fa05b6
commit 621893c
Show file tree

Hide file tree

Showing 4 changed files with 532 additions and 2,424 deletions.
diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySummaryReportController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySummaryReportController.java
@@ -29,6 +29,7 @@
 
 import com.divudi.data.BillTypeAtomic;
 import com.divudi.data.IncomeBundle;
+import com.divudi.data.IncomeRow;
 import com.divudi.entity.Bill;
 import com.divudi.entity.Category;
 import com.divudi.entity.WebUser;
@@ -244,6 +245,17 @@ public void processPharmacyIncomeReport() {
 
         List<Bill> bills = billService.fetchBills(fromDate, toDate, institution, site, department, webUser, billTypeAtomics);
         bundle = new IncomeBundle(bills);
+        for (IncomeRow r : bundle.getRows()) {
+            if (r.getBill() == null) {
+                continue;
+            }
+            if (r.getBill().getPaymentMethod() == null) {
+                continue;
+            }
+            if(r.getBill().getPaymentMethod().equals(PaymentMethod.MultiplePaymentMethods)){
+                r.setPayments(billService.fetchBillPayments(r.getBill()));
+            }
+        }
         bundle.generatePaymentDetailsForBills();
     }