Issue#10275 fix interim bill don't get child encounter's items and fees

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

@@ -857,7 +857,7 @@ public String navigatePatientAdmit() {
         return "/inward/inward_admission?faces-redirect=true;";
 
     }
-
+    
     public String navigateToConvertNonBhtToBht(Admission nonBhtAd) {
         Admission ad = new Admission();
         if (ad.getDateOfAdmission() == null) {

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

@@ -1385,7 +1385,7 @@ public void saveConvertSelected() {
         getCurrentNonBht().setParentEncounter(current);
         getCurrentNonBht().setDischarged(true);
         getCurrentNonBht().setDateOfDischarge(new Date());
-        getCurrentNonBht().setConvertedToBht(true);
+        getCurrentNonBht().setConvertedToAnotherEncounter(true);
         getFacade().edit(currentNonBht);
         currentNonBht = null;
 

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

@@ -103,6 +103,8 @@ public class InwardBeanController implements Serializable {
     private PriceMatrixFacade priceMatrixFacade;
     @EJB
     private AdmissionFacade admissionFacade;
+    @EJB
+    private PatientEncounterFacade encounterFacade;
     @Inject
     BillBeanController billBean;
     @Inject
@@ -459,11 +461,20 @@ public List<BillFee> createDoctorAndNurseFee(PatientEncounter patientEncounter)
                 + " and type(bt.staff)!=:class "
                 + " and bt.fee.feeType=:ftp "
                 + " and (bt.bill.billType=:btp)"
-                + " and bt.bill.patientEncounter=:pe ";
+                + " and bt.bill.patientEncounter IN :pe ";
         hm.put("class", Consultant.class);
         hm.put("ftp", FeeType.Staff);
         hm.put("btp", BillType.InwardProfessional);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
 
         return getBillFeeFacade().findByJpql(sql, hm, TemporalType.TIME);
 
@@ -476,12 +487,21 @@ public List<BillFee> createProfesionallFee(PatientEncounter patientEncounter) {
                 + " and type(bt.staff)=:class "
                 + " and bt.fee.feeType=:ftp "
                 + " and (bt.bill.billType=:btp)"
-                + " and bt.bill.patientEncounter=:pe "
+                + " and bt.bill.patientEncounter IN :pe "
                 + " order by bt.feeAdjusted desc ";
         hm.put("class", Consultant.class);
         hm.put("ftp", FeeType.Staff);
         hm.put("btp", BillType.InwardProfessional);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
 
         return getBillFeeFacade().findByJpql(sql, hm, TemporalType.TIME);
         //////// // System.out.println("Size : " + profesionallFee.size());
@@ -515,11 +535,20 @@ public void setProfesionallFeeAdjusted(PatientEncounter patientEncounter) {
                 + " and type(bt.staff)=:class "
                 + " and bt.fee.feeType=:ftp "
                 + " and (bt.bill.billType=:btp)"
-                + " and bt.bill.patientEncounter=:pe ";
+                + " and bt.bill.patientEncounter in :pe ";
         hm.put("class", Consultant.class);
         hm.put("ftp", FeeType.Staff);
         hm.put("btp", BillType.InwardProfessional);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
 
         List<BillFee> list = getBillFeeFacade().findByJpql(sql, hm);
 
@@ -539,12 +568,21 @@ public List<Bill> fetchIssueTable(PatientEncounter patientEncounter, BillType bi
                 + " WHERE b.retired=false "
                 + " and b.billType=:btp "
                 + " and (b.billedBill is null )  "
-                + " and  b.patientEncounter=:pe"
+                + " and  b.patientEncounter IN :pe"
                 + " and (type(b)=:class) ";
         hm = new HashMap();
         hm.put("btp", billType);
         hm.put("class", PreBill.class);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
 
         List<Bill> bills = getBillFacade().findByJpql(sql, hm);
 
@@ -553,13 +591,22 @@ public List<Bill> fetchIssueTable(PatientEncounter patientEncounter, BillType bi
                 + " WHERE b.retired=false "
                 + " and b.billType=:btp"
                 + " and type(b.billedBill)=:billedClass "
-                + " and  b.patientEncounter=:pe"
+                + " and  b.patientEncounter IN :pe"
                 + " and (type(b)=:class) ";
         hm = new HashMap();
         hm.put("btp", billType);
         hm.put("class", RefundBill.class);
         hm.put("billedClass", PreBill.class);
-        hm.put("pe", patientEncounter);
+       List<PatientEncounter> pts1 = new ArrayList<>();
+        pts1.add(patientEncounter);
+        List<PatientEncounter> cpts1 = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts1.size() > 0){
+            for(PatientEncounter pt : cpts1){
+                pts1.add(pt);
+            }
+        }
+        hm.put("pe", pts1);
 
         List<Bill> bills2 = getBillFacade().findByJpql(sql, hm);
 
@@ -941,10 +988,19 @@ private List<Department> getToDepartmentList(PatientEncounter patientEncounter,
         }
 
         sql += " and Type(b.item)!=TimedItem "
-                + " and b.bill.patientEncounter=:pe ";
+                + " and b.bill.patientEncounter in :pe ";
 
         hm.put("btp", BillType.InwardBill);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
 
         return getDepartmentFacade().findByJpql(sql, hm, TemporalType.TIME);
     }
@@ -961,12 +1017,21 @@ private List<Item> getToDepartmentItems(PatientEncounter patientEncounter, Depar
         }
 
         sql += " and Type(b.item)!=TimedItem"
-                + "  and b.bill.patientEncounter=:pe"
+                + "  and b.bill.patientEncounter IN :pe"
                 + " and b.bill.toDepartment=:dep "
                 + "  order by b.item.name ";
 
         hm.put("btp", BillType.InwardBill);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
         hm.put("dep", department);
 
         return getItemFacade().findByJpql(sql, hm, TemporalType.TIME);
@@ -1062,12 +1127,21 @@ private double calBillItemCount(Bill bill, Item item, PatientEncounter patientEn
             hm.put("fB", forwardBill);
         }
 
-        sql += " and b.bill.patientEncounter=:pe "
+        sql += " and b.bill.patientEncounter IN :pe "
                 + " and b.item=:itm "
                 + " and type(b.bill)=:cls";
 
         hm.put("btp", BillType.InwardBill);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
         hm.put("itm", item);
         hm.put("cls", bill.getClass());
         double dbl = getBillItemFacade().countByJpql(sql, hm, TemporalType.TIME);
@@ -1101,11 +1175,20 @@ public List<Bill> fetchOutSideBill(PatientEncounter patientEncounter) {
         String sql = "Select i From BilledBill i "
                 + " where i.retired=false"
                 + "  and i.billType=:btp "
-                + " and i.patientEncounter=:pe ";
+                + " and i.patientEncounter in :pe ";
 
         HashMap m = new HashMap();
         m.put("btp", BillType.InwardOutSideBill);
-        m.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        m.put("pe", pts);
         return getBillFacade().findByJpql(sql, m, TemporalType.DATE);
 
         //return additionalChargeBill;
@@ -1142,14 +1225,37 @@ public double caltValueFromAdditionalCharge(InwardChargeType inwardChargeType, P
 
         return val;
     }
+
+    public List<PatientEncounter> fetchChildPatientEncounter(PatientEncounter patientEncounter){
+        List<PatientEncounter> cpt = new ArrayList<>();
+
+        HashMap hm = new HashMap();
+        String sql = "SELECT pe FROM PatientEncounter pe "
+                + " where pe.parentEncounter = :pe "
+                + " and pe.retired=false ";
+        hm.put("pe", patientEncounter);
+
+        cpt = encounterFacade.findByJpql(sql, hm);
+
+        return cpt;
+    }
 
     public List<PatientItem> fetchPatientItem(PatientEncounter patientEncounter) {
         HashMap hm = new HashMap();
         String sql = "SELECT i FROM PatientItem i "
                 + " where Type(i.item)=TimedItem "
                 + " and i.retired=false "
-                + " and i.patientEncounter=:pe";
-        hm.put("pe", patientEncounter);
+                + " and i.patientEncounter in :pe";
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
         return getPatientItemFacade().findByJpql(sql, hm);
     }
 
@@ -1159,9 +1265,18 @@ public List<Bill> fetchPaymentBill(PatientEncounter patientEncounter) {
         String sql = "SELECT  b FROM Bill b "
                 + " WHERE b.retired=false "
                 + " and b.billType=:btp "
-                + " and b.patientEncounter=:pe ";
+                + " and b.patientEncounter IN :pe ";
         hm.put("btp", BillType.InwardPaymentBill);
-        hm.put("pe", patientEncounter);
+        List<PatientEncounter> pts = new ArrayList<>();
+        pts.add(patientEncounter);
+        List<PatientEncounter> cpts = fetchChildPatientEncounter(patientEncounter);
+        System.out.println("cpts = " + cpts);
+        if(cpts.size() > 0){
+            for(PatientEncounter pt : cpts){
+                pts.add(pt);
+            }
+        }
+        hm.put("pe", pts);
         return getBillFacade().findByJpql(sql, hm, TemporalType.TIMESTAMP);
 
     }

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

@@ -759,8 +759,10 @@ public void settlePharmacyBhtIssue() {
             if (getPatientEncounter().getCurrentPatientRoom() == null) {
                 matrixDept = getSessionController().getDepartment();
             }
-            if (getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge() != null) {
-                matrixDept = getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge().getDepartment();
+            if (getPatientEncounter().getCurrentPatientRoom() != null) {
+                if (getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge() != null) {
+                    matrixDept = getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge().getDepartment();
+                }
             }
 
         } else if (matrixByIssuingDepartment) {
@@ -1404,7 +1406,7 @@ public void calculateRates(BillItem bi) {
         double grossValue;
         double netValue;
 
-        Department matrixDept=null;
+        Department matrixDept = null;
         boolean matrixByAdmissionDepartment;
         boolean matrixByIssuingDepartment;
         matrixByAdmissionDepartment = configOptionApplicationController.getBooleanValueByKey("Price Matrix is calculated from Inpatient Department for " + sessionController.getDepartment().getName(), true);
@@ -1416,8 +1418,10 @@ public void calculateRates(BillItem bi) {
             if (getPatientEncounter().getCurrentPatientRoom() == null) {
                 matrixDept = getSessionController().getDepartment();
             }
-            if (getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge() != null) {
-                matrixDept = getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge().getDepartment();
+            if (getPatientEncounter().getCurrentPatientRoom() != null) {
+                if (getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge() != null) {
+                    matrixDept = getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge().getDepartment();
+                }
             }
 
         } else if (matrixByIssuingDepartment) {

src/main/java/com/divudi/entity/PatientEncounter.java

@@ -167,7 +167,7 @@ public class PatientEncounter implements Serializable, RetirableEntity {
     private Staff referringConsultant;
     @ManyToOne
     private Staff referringStaff;
-    private boolean convertedToBht;
+    private boolean convertedToAnotherEncounter;
 
     // Transient method for BP
     public String getBp() {
@@ -1031,12 +1031,12 @@ public void setGuardianRelationshipToPatient(Item guardianRelationshipToPatient)
         this.guardianRelationshipToPatient = guardianRelationshipToPatient;
     }
 
-    public boolean isConvertedToBht() {
-        return convertedToBht;
+    public boolean isConvertedToAnotherEncounter() {
+        return convertedToAnotherEncounter;
     }
 
-    public void setConvertedToBht(boolean convertedToBht) {
-        this.convertedToBht = convertedToBht;
+    public void setConvertedToAnotherEncounter(boolean convertedToAnotherEncounter) {
+        this.convertedToAnotherEncounter = convertedToAnotherEncounter;
     }
 
 

src/main/webapp/inward/inpatient_search_without_room.xhtml

@@ -237,7 +237,7 @@
                                                              icon="fa fa-repeat" 
                                                              title="Convert to BHT"
                                                              action="#{patientController.navigateToConvertNonBhtToBht(a)}"
-                                                             disabled="#{a.convertedToBht}">
+                                                             disabled="#{a.convertedToAnotherEncounter}">
                                                 <f:setPropertyActionListener value="#{a}" target="#{admissionController.current}" />
                                             </p:commandButton>
 

src/main/webapp/inward/inward_bill_final.xhtml

@@ -24,6 +24,7 @@
                             <div>
                                 <p:commandButton update="dList tot" value="Process"
                                                  actionListener="#{bhtSummeryController.updateTotal()}"
+                                                 ajax="false"
                                                  class="ui-button-warning" icon="fas fa-cog"
                                                  style="width: 150px; padding: 1px; margin: auto;" />
                                 <p:commandButton  value="Settle" action="#{bhtSummeryController.settle}" 

src/main/webapp/inward/inward_bill_service.xhtml

@@ -83,7 +83,7 @@
                                     ajax="false"
                                     value="Inpatient Dashboard"
                                     icon="fa fa-id-card"
-                                    class="ui-button-warning m-1" 
+                                    class="ui-button-secondary m-1" 
                                     action="#{bhtSummeryController.navigateToInpatientProfile()}" 
                                     >
                                     <f:setPropertyActionListener 

src/main/webapp/inward/inward_room_change.xhtml

@@ -77,7 +77,7 @@
                             <p:commandButton
                                 ajax="false"
                                 icon="fa-solid fa-address-card"
-                                class="ui-button-info mx-1" 
+                                class="ui-button-secondary mx-1" 
                                 value="Inpatient Dashboard"
                                 action="#{admissionController.navigateToAdmissionProfilePage}" 
                                 >