Merge pull request #10794 from hmislk/development

Update Coop-test to Latest
hmislk · Feb 28, 2025 · 6ad6290 · 6ad6290
2 parents b5299b3 + 5d60b40
commit 6ad6290
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 53 deletions.
diff --git a/src/main/java/com/divudi/bean/common/BillBeanController.java b/src/main/java/com/divudi/bean/common/BillBeanController.java
@@ -2474,12 +2474,17 @@ public ItemFee getItemFee(BillItem billItem, FeeType feeType) {
 //        hm.put("nm", FeeType.Matrix);
 //        return getFeeFacade().findFirstByJpql(sql, hm, TemporalType.TIMESTAMP);
 //    }
-    public BillFee createBillFee(BillItem billItem, Fee i) {
+    public BillFee createBillFee(BillItem billItem, Fee i, PatientEncounter patientEncounter) {
         BillFee f;
         f = new BillFee();
         f.setFee(i);
-        f.setFeeValue(i.getFee());
-        f.setFeeGrossValue(i.getFee());
+        if(patientEncounter.isForiegner()){
+            f.setFeeValue(i.getFfee());
+            f.setFeeGrossValue(i.getFfee());
+        }else{
+            f.setFeeValue(i.getFee());
+            f.setFeeGrossValue(i.getFee());
+        }
         f.setDepartment(billItem.getItem().getDepartment());
         f.setBillItem(billItem);
 

diff --git a/src/main/java/com/divudi/bean/inward/BillBhtController.java b/src/main/java/com/divudi/bean/inward/BillBhtController.java
@@ -780,7 +780,7 @@ public List<BillFee> billFeeFromBillItemWithMatrix(BillItem billItem, PatientEnc
         List<ItemFee> itemFee = getBillBean().getItemFee(billItem);
 
         for (Fee i : itemFee) {
-            BillFee billFee = getBillBean().createBillFee(billItem, i);
+            BillFee billFee = getBillBean().createBillFee(billItem, i, patientEncounter);
 
             PriceMatrix priceMatrix = getPriceMatrixController().fetchInwardMargin(billItem, billFee.getFeeGrossValue(), matrixDepartment, paymentMethod);
 

diff --git a/src/main/java/com/divudi/bean/inward/InwardProfessionalBillController.java b/src/main/java/com/divudi/bean/inward/InwardProfessionalBillController.java
@@ -26,6 +26,7 @@
 import com.divudi.entity.BillItem;
 import com.divudi.entity.BilledBill;
 import com.divudi.entity.Item;
+import com.divudi.entity.PatientEncounter;
 import com.divudi.entity.Speciality;
 import com.divudi.entity.Staff;
 import com.divudi.entity.inward.EncounterComponent;
@@ -758,7 +759,9 @@ public String navigateToAddProfessionalFeesFromMenu() {
         return "/inward/inward_bill_professional?faces-redirect=true";
     }
 
-    public String navigateToAddProfessionalFeesFromInpatientProfile() {
+    public String navigateToAddProfessionalFeesFromInpatientProfile(PatientEncounter pe) {
+        makeNull();
+        getCurrent().setPatientEncounter(pe);
         return "/inward/inward_bill_professional?faces-redirect=true";
     }
 

diff --git a/src/main/java/com/divudi/bean/inward/InwardTimedItemController.java b/src/main/java/com/divudi/bean/inward/InwardTimedItemController.java
@@ -346,9 +346,9 @@ public void removePatientItem(PatientItem patientItem) {
             patientItem.setRetiredAt(new Date());
             patientItem.setRetired(true);
             getPatientItemFacade().edit(patientItem);
-            
+
             createPatientItems();
-            
+
             JsfUtil.addSuccessMessage("Removed successfully.");
         }
     }
@@ -521,21 +521,23 @@ public void makeNull() {
 
     public String navigateToAddInwardTimedServicesFromMenu() {
         makeNull();
-        return "/inward/inward_timed_service_consume";
+        return "/inward/inward_timed_service_consume?faces-redirect=true";
     }
 
-    public String navigateToAddInwardTimedServicesFromInpatientProfile() {
-        return "/inward/inward_timed_service_consume";
+    public String navigateToAddInwardTimedServicesFromInpatientProfile(PatientEncounter pe) {
+        makeNull();
+        getCurrent().setPatientEncounter(pe);
+        return "/inward/inward_timed_service_consume?faces-redirect=true";
     }
 
     public String navigateToAddInwardTimedServiceForTheatreFromMenu() {
         makeNull();
-        return "/theater/inward_timed_service_consume_surgery";
+        return "/theater/inward_timed_service_consume_surgery?faces-redirect=true";
     }
 
     public String navigateToAddInwardTimedServiceForTheatreFromInpatientProfile() {
         makeNull();
-        return "/theater/inward_timed_service_consume_surgery";
+        return "/theater/inward_timed_service_consume_surgery?faces-redirect=true";
     }
 
     private boolean errorCheck() {
@@ -560,7 +562,14 @@ public void save() {
         }
         double count = getInwardBean().calCount(timedItemFee, getCurrent().getPatientEncounter().getDateOfAdmission(), getCurrent().getToTime());
 
-        getCurrent().setServiceValue(count * timedItemFee.getFee());
+        System.out.println("getCurrent().getPatientEncounter().isForiegner() = " + getCurrent().getPatientEncounter().isForiegner());
+
+        if (getCurrent().getPatientEncounter().isForiegner()) {
+            getCurrent().setServiceValue(count * timedItemFee.getFfee());
+        } else {
+            getCurrent().setServiceValue(count * timedItemFee.getFee());
+        }
+
         getCurrent().setCreater(getSessionController().getLoggedUser());
         getCurrent().setCreatedAt(Calendar.getInstance().getTime());
         if (getCurrent().getId() == null) {
@@ -574,7 +583,7 @@ public void save() {
         current.setItem(null);
 
         createPatientItems();
-        
+
         JsfUtil.addSuccessMessage("Added Successfully.");
 
     }
@@ -608,12 +617,21 @@ public void finalizeService(PatientItem pic) {
         TimedItemFee timedItemFee = getInwardBean().getTimedItemFee((TimedItem) temPi.getItem());
         double count = getInwardBean().calCount(timedItemFee, temPi.getFromTime(), temPi.getToTime());
 
-        pic.setServiceValue(count * timedItemFee.getFee());
+        System.out.println("pic.getPatientEncounter().isForiegner() = " + pic.getPatientEncounter().isForiegner());
+
+        if (pic.getPatientEncounter().isForiegner()) {
+            System.out.println("timedItemFee.getFfee() = " + timedItemFee.getFfee());
+            pic.setServiceValue(count * timedItemFee.getFfee());
+        } else {
+            System.out.println("timedItemFee.getFee() = " + timedItemFee.getFee());
+            pic.setServiceValue(count * timedItemFee.getFee());
+        }
+        System.out.println("pic.getServiceValue() = " + pic.getServiceValue());
 
         getPatientItemFacade().edit(pic);
 
         createPatientItems();
-        
+
         JsfUtil.addSuccessMessage("Updated Successfully.");
 
     }
@@ -632,7 +650,12 @@ public void createPatientItems() {
         for (PatientItem pi : items) {
             TimedItemFee timedItemFee = getInwardBean().getTimedItemFee((TimedItem) pi.getItem());
             double count = getInwardBean().calCount(timedItemFee, pi.getFromTime(), pi.getToTime());
-            pi.setServiceValue(count * timedItemFee.getFee());
+            if (getCurrent().getPatientEncounter().isForiegner()) {
+                pi.setServiceValue(count * timedItemFee.getFfee());
+            } else {
+                pi.setServiceValue(count * timedItemFee.getFee());
+            }
+
         }
     }
 

diff --git a/src/main/webapp/inward/admission_profile.xhtml b/src/main/webapp/inward/admission_profile.xhtml
@@ -150,7 +150,7 @@
                                 </p:commandButton>
                                 <p:commandButton 
                                     value="Add Professional Fees" 
-                                    action="#{inwardProfessionalBillController.navigateToAddProfessionalFeesFromInpatientProfile()}" 
+                                    action="#{inwardProfessionalBillController.navigateToAddProfessionalFeesFromInpatientProfile(admissionController.current)}" 
                                     icon="fa fa-user-md"
                                     class="w-100">
                                     <f:setPropertyActionListener 
@@ -169,7 +169,7 @@
 
                                 <p:commandButton 
                                     value="Add Timed Services" 
-                                    action="#{inwardTimedItemController.navigateToAddInwardTimedServicesFromInpatientProfile()}" 
+                                    action="#{inwardTimedItemController.navigateToAddInwardTimedServicesFromInpatientProfile(admissionController.current)}" 
                                     icon="fa fa-clock"
                                     class="w-100">
                                     <f:setPropertyActionListener