Merge branch 'development' into Issue#9680-Collection-Center-Bill-Wis…

…e-Detail-Report
hmislk · Dec 24, 2024 · d800550 · d800550
2 parents e15beb0 + 02c548b
commit d800550
Show file tree

Hide file tree

Showing 13 changed files with 412 additions and 38 deletions.
diff --git a/src/main/java/com/divudi/bean/common/BillBeanController.java b/src/main/java/com/divudi/bean/common/BillBeanController.java
@@ -2267,9 +2267,9 @@ public void updateInwardDipositList(PatientEncounter patientEncounter, Bill bill
                 patientEncounter.getFinalBill().setBalance(patientEncounter.getFinalBill().getBalance() - bill.getNetTotal());
                 patientEncounter.getFinalBill().setPaidAmount(patientEncounter.getFinalBill().getPaidAmount() + bill.getNetTotal());
 
-                if(bill.getPaymentMethod() != PaymentMethod.Credit){   
+                if(bill.getBillTypeAtomic() == BillTypeAtomic.INWARD_DEPOSIT){   
                     patientEncounter.getFinalBill().setSettledAmountByPatient(patientEncounter.getFinalBill().getSettledAmountByPatient() + bill.getNetTotal());
-                }else if(bill.getPaymentMethod() == PaymentMethod.Credit){
+                }else if(bill.getBillTypeAtomic()== BillTypeAtomic.INPATIENT_CREDIT_COMPANY_PAYMENT_RECEIVED){
                     patientEncounter.getFinalBill().setSettledAmountBySponsor(patientEncounter.getFinalBill().getSettledAmountBySponsor()+ bill.getNetTotal());
                 }
                 getBillFacade().edit(patientEncounter.getFinalBill());

diff --git a/src/main/java/com/divudi/bean/common/CashRecieveBillController.java b/src/main/java/com/divudi/bean/common/CashRecieveBillController.java
@@ -193,14 +193,33 @@ public void setComment(String comment) {
     @Inject
     private AdmissionController admissionController;
 
+//    public void selectInstitutionListenerBht() {
+//        Institution ins = institution;
+//        makeNull();
+//
+//        List<Admission> list = getAdmissionController().getCreditBillsBht(ins);
+//        for (PatientEncounter b : list) {
+//            getCurrentBillItem().setPatientEncounter(b);
+//            selectBhtListener();
+//            addToBht();
+//        }
+//        if (billItems != null) {
+//            selectedBillItems.addAll(billItems);
+//        }
+//        calTotal();
+//    }
+
     public void selectInstitutionListenerBht() {
         Institution ins = institution;
         makeNull();
 
-        List<Admission> list = getAdmissionController().getCreditBillsBht(ins);
-        for (PatientEncounter b : list) {
-            getCurrentBillItem().setPatientEncounter(b);
-            selectBhtListener();
+        List<Bill> list = getAdmissionController().getCreditPaymentBillsBht(ins);
+        for (Bill b : list) {
+            getCurrentBillItem().setPatientEncounter(b.getPatientEncounter());
+            getCurrentBillItem().setNetValue(b.getNetTotal());
+            getCurrentBillItem().getPatientEncounter().setCreditCompany(b.getCreditCompany());
+            getCurrentBillItem().setBill(b);
+//            selectBhtListener();
             addToBht();
         }
         if (billItems != null) {
@@ -1034,15 +1053,26 @@ public void settleBillBht() {
         getCurrent().setTotal(getCurrent().getNetTotal());
 
         saveBill(BillType.CashRecieveBill, BillTypeAtomic.INPATIENT_CREDIT_COMPANY_PAYMENT_RECEIVED);
+        updateReferanceBills();
         saveBillItemBht();
-
+
+
         WebUser wb = getCashTransactionBean().saveBillCashInTransaction(getCurrent(), getSessionController().getLoggedUser());
         getSessionController().setLoggedUser(wb);
         //   savePayments();
         JsfUtil.addSuccessMessage("Bill Saved");
         printPreview = true;
 
     }
+
+    public void updateReferanceBills(){
+        for(BillItem b : getSelectedBillItems()){
+            b.getBill().setPaid(true);
+            b.getBill().setPaidAmount(b.getNetValue());
+            b.getBill().setPaidBill(getCurrent());
+            billFacade.edit(b.getBill());
+        }
+    }
 
     public List<Payment> createPayment(Bill bill, PaymentMethod pm) {
         List<Payment> ps = new ArrayList<>();
@@ -1250,6 +1280,7 @@ private void saveBillItemBht() {
             getCurrent().getBillItems().add(tmp);
             getBillItemFacade().create(tmp);
 
+            getBillBean().updateInwardDipositList(tmp.getPatientEncounter(), getCurrent());
             updateReferenceBht(tmp);
 
         }

diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java
@@ -335,7 +335,6 @@ public class ReportsController implements Serializable {
     Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap7to1;
     Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap1to7;
 
-
     private boolean showChart;
 
     public String getDischargedStatus() {
@@ -403,6 +402,7 @@ public void setSelectedDateType(String selectedDateType) {
         this.selectedDateType = selectedDateType;
     }
 
+
     public Investigation getInvestigation() {
         return investigation;
     }
@@ -3506,7 +3506,7 @@ private void groupBills() {
         bundle.setGroupedBillItemsByInstitution(billMap);
     }
 
-    public Double calculateNetAmountSubTotalByBills(List<Bill> bills) {
+    public Double calculateNetTotalByBills(List<Bill> bills) {
         Double netTotal = 0.0;
 
         for (Bill bill : bills) {
@@ -3516,7 +3516,7 @@ public Double calculateNetAmountSubTotalByBills(List<Bill> bills) {
         return netTotal;
     }
 
-    public Double calculateDiscountSubTotalByBills(List<Bill> bills) {
+    public Double calculateDiscountByBills(List<Bill> bills) {
         Double discount = 0.0;
 
         for (Bill bill : bills) {
@@ -3526,7 +3526,6 @@ public Double calculateDiscountSubTotalByBills(List<Bill> bills) {
         return discount;
     }
 
-
     public Double calculateNetAmountNetTotal() {
         double netAmountNetTotal = 0.0;
         Map<Institution, List<Bill>> billMap = bundle.getGroupedBillItemsByInstitution();
@@ -3639,10 +3638,10 @@ public Double calculateSponsorShareNetTotal() {
         for (Map.Entry<Institution, List<Bill>> entry : billMap.entrySet()) {
             List<Bill> bills = entry.getValue();
 
-            sponsorShareNetTotal += calculateSponsorShareSubTotalByBills(bills);
+            subTotal += calculateNetTotalByBills(bills);
         }
 
-        return sponsorShareNetTotal;
+        return subTotal;
     }
 
     public void generateDiscountReport() {

diff --git a/src/main/java/com/divudi/bean/inward/AdmissionController.java b/src/main/java/com/divudi/bean/inward/AdmissionController.java
@@ -43,6 +43,7 @@
 import com.divudi.facade.RoomFacade;
 import com.divudi.bean.common.util.JsfUtil;
 import com.divudi.bean.pharmacy.PharmacyRequestForBhtController;
+import com.divudi.data.BillTypeAtomic;
 import com.divudi.data.clinical.ClinicalFindingValueType;
 import com.divudi.entity.Department;
 import com.divudi.entity.Staff;
@@ -362,6 +363,23 @@ public List<Admission> getCreditBillsBht(Institution institution) {
 
         return lst;
     }
+
+    public List<Bill> getCreditPaymentBillsBht(Institution institution) {
+        String sql;
+        HashMap hash = new HashMap();
+
+        sql = "select b from Bill b "
+                + " where b.retired=false "
+                + " and b.creditCompany=:ins"
+                + " and b.billTypeAtomic=:bta ";
+
+        hash.put("ins", institution);
+        hash.put("bta", BillTypeAtomic.INWARD_FINAL_BILL_PAYMENT_BY_CREDIT_COMPANY);
+        //     hash.put("pm", PaymentMethod.Credit);
+        List<Bill> lst = getBillFacade().findByJpql(sql, hash);
+        System.out.println("lst = " + lst);
+        return lst;
+    }
 
 //    public List<Admission> completePatientPaymentDue(String qry) {
 //        String sql = "Select b.patientEncounter From "

diff --git a/src/main/java/com/divudi/bean/lab/InvestigationController.java b/src/main/java/com/divudi/bean/lab/InvestigationController.java
@@ -482,6 +482,23 @@ public String navigateToEditFormatSingle() {
         return investigationItemController.toEditInvestigationFormat();
     }
 
+    public String navigateExportReoirtFormat() {
+        if (current == null) {
+            JsfUtil.addErrorMessage("Please select investigation");
+            return "";
+        }
+        if (current.getId() == null) {
+            JsfUtil.addErrorMessage("Please save investigation first.");
+            return "";
+        }
+        if (current.getReportedAs() == null) {
+            current.setReportedAs(current);
+        }
+        investigationItemController.setCurrentInvestigation((Investigation) current.getReportedAs());
+        investigationItemController.listInvestigationItem();
+        return "/admin/lims/export?faces-redirect=true";
+    }
+
     public String navigateToEditFormatSinglePastData() {
         if (current == null) {
             JsfUtil.addErrorMessage("Please select investigation");