19655 inward reports rename charge type summary add bht level charge type breakdown detail report

src/main/java/com/divudi/bean/inward/BhtPaymentSummaryReportController.java

@@ -15,7 +15,6 @@
 import com.divudi.core.facade.PaymentFacade;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -67,8 +66,8 @@ public class BhtPaymentSummaryReportController implements Serializable {
     // -------------------------------------------------------------------------
     private List<BhtPaymentSummaryDTO> reportRows;
 
-    /** All PaymentMethod values — drives the dynamic columns in XHTML. */
-    private final List<PaymentMethod> allPaymentMethods = Arrays.asList(PaymentMethod.values());
+    /** Payment methods that have at least one non-zero deposit in the current result set. */
+    private List<PaymentMethod> allPaymentMethods = new ArrayList<>();
 
     /** Column totals, keyed by PaymentMethod ordinal. */
     private Map<PaymentMethod, Double> columnTotals = new HashMap<>();
@@ -87,20 +86,29 @@ public void generateReport() {
 
         List<PatientEncounter> encounters = fetchEncounters();
         if (encounters == null || encounters.isEmpty()) {
+            allPaymentMethods = new ArrayList<>();
             return;
         }
 
         for (PatientEncounter enc : encounters) {
             BhtPaymentSummaryDTO row = buildRow(enc);
             reportRows.add(row);
 
-            // accumulate column totals
-            for (PaymentMethod pm : allPaymentMethods) {
+            // accumulate column totals across all known methods
+            for (PaymentMethod pm : PaymentMethod.values()) {
                 columnTotals.merge(pm, row.getDepositForMethod(pm), Double::sum);
             }
             grandTotalDeposits += row.getTotalDeposits();
             grandTotalCreditSettlement += row.getCreditSettlementTotal();
         }
+
+        // only show columns where at least one BHT had a non-zero deposit
+        allPaymentMethods = new ArrayList<>();
+        for (PaymentMethod pm : PaymentMethod.values()) {
+            if (columnTotals.getOrDefault(pm, 0.0) != 0.0) {
+                allPaymentMethods.add(pm);
+            }
+        }
     }
 
     // -------------------------------------------------------------------------
@@ -269,6 +277,7 @@ public void makeNull() {
         columnTotals = new HashMap<>();
         grandTotalDeposits = 0;
         grandTotalCreditSettlement = 0;
+        allPaymentMethods = new ArrayList<>();
     }
 
     // -------------------------------------------------------------------------