Collection center bill wise detail report bug fix

src/main/java/com/divudi/bean/common/ReportsController.java

@@ -61,6 +61,7 @@
 import java.text.SimpleDateFormat;
 import java.util.stream.Collectors;
 import java.text.DecimalFormat;
+
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 
 /**
@@ -2650,7 +2651,7 @@ public void generateDebtorBalanceReport(final boolean onlyDueBills) {
     }
 
     public ReportTemplateRowBundle generateDebtorBalanceReportBills(List<BillTypeAtomic> bts, List<PaymentMethod> billPaymentMethods,
-            boolean onlyDueBills) {
+                                                                    boolean onlyDueBills) {
         Map<String, Object> parameters = new HashMap<>();
         String jpql = "SELECT new com.divudi.data.ReportTemplateRow(bill) "
                 + "FROM Bill bill "
@@ -3014,7 +3015,7 @@ public ReportTemplateRowBundle generateCollectingCenterBillWiseBillItems(List<Bi
         }
 
         if (department != null) {
-            jpql += "AND bill.toDepartment = :dep ";
+            jpql += "AND bill.department = :dep ";
             parameters.put("dep", department);
         }
 
@@ -3330,7 +3331,7 @@ private ReportTemplateRowBundle generateExternalLaboratoryWorkloadSummaryBillIte
         parameters.put("bts", bts);
         parameters.put("fd", fromDate);
         parameters.put("td", toDate);
-        
+
         String jpql = "SELECT new com.divudi.data.ReportTemplateRow(billItem.item.name, SUM(billItem.qty)) "
                 + "FROM PatientInvestigation pi "
                 + "JOIN pi.billItem billItem "
@@ -3589,7 +3590,7 @@ public void exportOpdAndInwardOPToPdf() {
             table.setWidths(columnWidths);
 
             String[] headers = {"S. No", "Invoice Date", "Invoice No", "Customer Reference No", "MRNO", "Patient Name",
-                "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
+                    "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
             for (String header : headers) {
                 PdfPCell cell = new PdfPCell(new Phrase(header, boldFont));
                 cell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -3812,7 +3813,7 @@ public void exportOpdAndInwardIPToPdf() {
             table.setWidths(columnWidths);
 
             String[] headers = {"S. No", "BHT No", "Invoice Date", "Invoice No", "Customer Reference No", "MRNO", "Patient Name",
-                "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
+                    "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
             for (String header : headers) {
                 PdfPCell cell = new PdfPCell(new Phrase(header, boldFont));
                 cell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -4854,8 +4855,8 @@ public void exportDetailedWeeklyOPDReportToPDF() {
     }
 
     private void addWeeklyReportSection(Document document, String sectionTitle, List<String> itemList,
-            List<Integer> daysOfWeek, Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap,
-            int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException {
+                                        List<Integer> daysOfWeek, Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap,
+                                        int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException {
         document.add(new com.itextpdf.text.Paragraph(sectionTitle, headerFont));
         document.add(com.itextpdf.text.Chunk.NEWLINE);
 

src/main/java/com/divudi/bean/pharmacy/PharmacyController.java

@@ -1004,6 +1004,7 @@ private void resetFields() {
         totalCreditPurchaseValue = 0.0;
         totalCashPurchaseValue = 0.0;
         totalPurchase = 0.0;
+        grantIssueQty = 0.0;
     }
 
     public void generateConsumptionReportTableByBill(BillType billType) {
@@ -1036,6 +1037,16 @@ public void generateConsumptionReportTableByBill(BillType billType) {
             tmp.put("dept", dept);
         }
 
+        if (category != null) {
+            sql += " AND EXISTS (SELECT bi FROM BillItem bi WHERE bi.bill = b AND bi.item.category = :category)";
+            tmp.put("category", category);
+        }
+
+        if (item != null) {
+            sql += " AND EXISTS (SELECT bi FROM BillItem bi WHERE bi.bill = b AND bi.item = :item)";
+            tmp.put("item", item);
+        }
+
         if (toDepartment != null) {
             sql += " AND b.toDepartment = :toDept";
             tmp.put("toDept", toDepartment);
@@ -1287,6 +1298,9 @@ public void generateConsumptionReportTableByDepartmentAndCategoryWise() {
     }
 
     public List<DepartmentCategoryWiseItems> generateConsumptionReportTableByDepartmentAndCategoryWise(BillType billType) {
+        totalSaleValue = 0.0;
+        qty = 0.0;
+
         Map<String, Object> parameters = new HashMap<>();
         String jpql = "SELECT new com.divudi.data.DepartmentCategoryWiseItems("
                 + "bi.bill.department, "
@@ -1404,6 +1418,11 @@ public void generateConsumptionReportTableAsDepartmentSummary(List<DepartmentCat
             for (Map.Entry<String, Double> consumptionEntry : consumptionMap.entrySet()) {
                 String consumptionDepartmentName = consumptionEntry.getKey();
                 double netTotal = consumptionEntry.getValue();
+
+                if (netTotal == 0) {
+                    continue;
+                }
+
                 departmentSummaries.add(new PharmacySummery(null, consumptionDepartmentName, netTotal));
             }