Closes #407

Signed-off-by: buddhika75 <[email protected]>

pom.xml

@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.divudi</groupId>
 
-    <artifactId>sethma</artifactId>
+    <artifactId>ruhunu-dev</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
-    <name>sethma</name>
+    <name>ruhunu-dev</name>
 
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>

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

@@ -803,6 +803,7 @@ public String settleBill() {
             }
 
             b.setBillItems(list);
+            b.setIpOpOrCc("OP");
 
             getBillFacade().edit(b);
             getBillBean().calculateBillItems(b, getLstBillEntries());
@@ -822,24 +823,24 @@ public String settleBill() {
         saveBillItemSessions();
         JsfUtil.addSuccessMessage("Bill Saved");
         checkBillValues();
-        
+
         if (getToken() != null) {
             if (getToken().getBill() == null) {
                 getToken().setBill(batchBill);
                 tokenFacade.edit(getToken());
                 markToken(batchBill);
-            }else{
-                Token t=new Token();
+            } else {
+                Token t = new Token();
                 t.setPatient(getToken().getPatient());
                 t.setBill(batchBill);
                 t.setTokenNumber(getToken().getTokenNumber());
                 tokenFacade.create(t);
                 getToken().setReferaToken(t);
                 tokenFacade.edit(t);
             }
-                
-            }
-        
+
+        }
+
         printPreview = true;
 
         return "/opd/opd_pre_bill?faces-redirect=true";
@@ -956,6 +957,7 @@ private void saveBatchBill() {
 
         newlyCreatingBatchBillPre.setNetTotal(tmpBatchBillTotalOfNetTotals);
         newlyCreatingBatchBillPre.setDiscount(tmpBatchBillTotalOfDiscounts);
+        newlyCreatingBatchBillPre.setIpOpOrCc("OP");
         newlyCreatingBatchBillPre.setTotal(tmpBatchBillTotalOfGrossTotals);
         getBillFacade().edit(newlyCreatingBatchBillPre);
 
@@ -1013,15 +1015,14 @@ private PreBill saveBill(Department bt, PreBill updatingPreBill) {
         updatingPreBill.setReferredByInstitution(referredByInstitution);
         //updatingPreBill.setCreditCompany(creditCompany);
         updatingPreBill.setComments(comment);
-
+        updatingPreBill.setIpOpOrCc("OP");
         //getBillBean().setPaymentMethodData(updatingPreBill, paymentMethod, getPaymentMethodData());
 
         updatingPreBill.setBillDate(new Date());
         updatingPreBill.setBillTime(new Date());
         updatingPreBill.setPatient(getPatient());
 
 //        updatingPreBill.setMembershipScheme(membershipSchemeController.fetchPatientMembershipScheme(getPatient(), getSessionController().getApplicationPreference().isMembershipExpires()));
-
         //updatingPreBill.setPaymentScheme(getPaymentScheme());
         //updatingPreBill.setPaymentMethod(paymentMethod);
         updatingPreBill.setCreatedAt(new Date());
@@ -1138,7 +1139,6 @@ private boolean errorCheck() {
 //            JsfUtil.addErrorMessage("Select Payment Method.");
 //            return true;
 //        }
-
 //        if (getPaymentSchemeController().errorCheckPaymentMethod(paymentMethod, getPaymentMethodData())) {
 //            return true;
 //        }
@@ -1162,7 +1162,6 @@ private boolean errorCheck() {
 //            JsfUtil.addErrorMessage("Check Payment method");
 //            return true;
 //        }
-
         return false;
     }
 
@@ -1386,7 +1385,7 @@ public void calTotals() {
         double billDiscount = 0.0;
         double billGross = 0.0;
         double billNet = 0.0;
-       
+
         for (BillEntry be : getLstBillEntries()) {
             //////// // System.out.println("bill item entry");
             double entryGross = 0.0;

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

@@ -1015,8 +1015,7 @@ public void fillCollectingCentreCourierPatientInvestigations() {
                 + " join pi.billItem.bill b "
                 + " join b.patient.person p "
                 + " where "
-                + " b.createdAt between :fromDate and :toDate  "
-                + " and pi.investigation.department=:dep ";
+                + " b.createdAt between :fromDate and :toDate  ";
 
         Map temMap = new HashMap();
         temMap.put("toDate", getToDate());
@@ -1028,7 +1027,7 @@ public void fillCollectingCentreCourierPatientInvestigations() {
             temMap.put("ccs", sessionController.getLoggableCollectingCentres());
         } else {
             jpql += " and b.collectingCentre=:cc ";
-            temMap.put("cc", sessionController.getLoggableCollectingCentres());
+            temMap.put("cc", institution);
         }
 
         if (getSearchKeyword().getPatientName() != null && !getSearchKeyword().getPatientName().trim().equals("")) {

src/main/java/com/divudi/bean/opd/OpdBillController.java

@@ -1750,6 +1750,7 @@ private boolean executeSettleBillActions() {
             }
             newSingleBill.setBillItems(list);
             newSingleBill.setBillTotal(newSingleBill.getNetTotal());
+            newSingleBill.setIpOpOrCc("OP");
             getBillFacade().edit(newSingleBill);
             getBillBean().calculateBillItems(newSingleBill, getLstBillEntries());
             if (getSessionController().getApplicationPreference().isPartialPaymentOfOpdBillsAllowed()) {
@@ -1995,6 +1996,7 @@ private void saveBatchBill() {
         newBatchBill.setFromInstitution(sessionController.getInstitution());
         newBatchBill.setFromDepartment(sessionController.getDepartment());
         newBatchBill.setPatient(patient);
+        newBatchBill.setIpOpOrCc("OP");
         newBatchBill.setInsId(
                 getBillNumberGenerator().institutionBillNumberGenerator(
                         getSessionController().getInstitution(),
@@ -2096,7 +2098,9 @@ private Bill saveBill(Department bt, Bill newBill) {
 
         newBill.setCreditCompany(creditCompany);
         newBill.setCollectingCentre(collectingCentre);
+        newBill.setIpOpOrCc("OP");
         newBill.setComments(comment);
+
 
         getBillBean().setPaymentMethodData(newBill, paymentMethod, getPaymentMethodData());
 
@@ -2178,6 +2182,7 @@ private Bill saveBill(Department bt, Category cat, Bill newBill) {
         newBill.setCreditCompany(creditCompany);
         newBill.setCollectingCentre(collectingCentre);
         newBill.setComments(comment);
+        newBill.setIpOpOrCc("OP");
 
         getBillBean().setPaymentMethodData(newBill, paymentMethod, getPaymentMethodData());
 

src/main/java/com/divudi/bean/store/StoreAdjustmentController.java

@@ -664,38 +664,38 @@ public void setStk(List<Stock> stk) {
         this.stk = stk;
     }
 
-    public void fillSelectStock() {
-        List<Stock> items = new ArrayList<>();
-        if (stock == null) {
-            stk = items;
-            return;
-        }
-        String sql;
-        Map<String, Object> m = new HashMap<>();
-
-        sql = "select i "
-                + " from Stock i "
-                + " where i.department=:d "
-                + " and i.itemBatch.item.code=:stationary "
-                + " order by i.stock desc";
-
-        m.put("d", sessionController.getDepartment());
-        m.put("stationary", stock.getItemBatch().getItem().getCode());  // Assuming stk contains the item
-
-        items = getStockFacade().findByJpql(sql, m);
-
-        if (items != null) {
-            stk = items;
-        }
-    }
-
-    public List<Stock> getStk() {
-        return stk;
-    }
-
-    public void setStk(List<Stock> stk) {
-        this.stk = stk;
-    }
+//    public void fillSelectStock() {
+//        List<Stock> items = new ArrayList<>();
+//        if (stock == null) {
+//            stk = items;
+//            return;
+//        }
+//        String sql;
+//        Map<String, Object> m = new HashMap<>();
+//
+//        sql = "select i "
+//                + " from Stock i "
+//                + " where i.department=:d "
+//                + " and i.itemBatch.item.code=:stationary "
+//                + " order by i.stock desc";
+//
+//        m.put("d", sessionController.getDepartment());
+//        m.put("stationary", stock.getItemBatch().getItem().getCode());  // Assuming stk contains the item
+//
+//        items = getStockFacade().findByJpql(sql, m);
+//
+//        if (items != null) {
+//            stk = items;
+//        }
+//    }
+//
+//    public List<Stock> getStk() {
+//        return stk;
+//    }
+//
+//    public void setStk(List<Stock> stk) {
+//        this.stk = stk;
+//    }
 
 //    public void fillSelectStock(){
 //        List<Stock> items = new ArrayList<>();