From de198e89dd3a88aea4e502146cf2764ae1c0ab60 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 19:42:38 +0530 Subject: [PATCH 1/8] Signed-off-by: DamithDeshan --- .../bean/common/BillPackageController.java | 6 + .../divudi/bean/common/ItemController.java | 89 +++++- src/main/webapp/opd/opd_bill_package.xhtml | 260 +++++++++--------- 3 files changed, 214 insertions(+), 141 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/BillPackageController.java b/src/main/java/com/divudi/bean/common/BillPackageController.java index bbddbd3e93..b987d9e1ca 100644 --- a/src/main/java/com/divudi/bean/common/BillPackageController.java +++ b/src/main/java/com/divudi/bean/common/BillPackageController.java @@ -894,6 +894,12 @@ public void clearBillValues() { setDiscount(0.0); setCashBalance(0.0); printPreview = false; + if (configOptionApplicationController.getBooleanValueByKey("Package bill – Reloading of Packages with Consideration of Gender")) { + itemController.getPackaes().clear(); + System.out.println("Page Loading"); + } else { + itemController.getPackaes(); + } } public void prepareNewBill() { diff --git a/src/main/java/com/divudi/bean/common/ItemController.java b/src/main/java/com/divudi/bean/common/ItemController.java index 86fda9aa96..f8dff25c48 100644 --- a/src/main/java/com/divudi/bean/common/ItemController.java +++ b/src/main/java/com/divudi/bean/common/ItemController.java @@ -32,6 +32,7 @@ import com.divudi.facade.ItemFeeFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.SessionNumberType; +import com.divudi.data.Sex; import com.divudi.entity.UserPreference; import com.divudi.facade.DepartmentFacade; import com.divudi.facade.ItemMappingFacade; @@ -138,6 +139,7 @@ public class ItemController implements Serializable { private InstitutionItemCount institutionItemCount; private List suggestItems; boolean masterItem; + private Sex patientGender; ReportKeyWord reportKeyWord; @@ -1018,10 +1020,7 @@ public void unmarkSelectedItemsFeesChangableAtBilling() { } JsfUtil.addSuccessMessage("All Unmarked as Fees Changable at Billing"); } - - - - + public void markSelectedItemsAsPrintSessionNumber() { if (selectedList == null || selectedList.isEmpty()) { JsfUtil.addErrorMessage("Nothing is selected"); @@ -1045,7 +1044,6 @@ public void unmarkSelectedItemsAsNotToPrintSessionNumber() { } JsfUtil.addSuccessMessage("All Marked as Not to Print Session Numbers"); } - public void unmarkSelectedItemsAsDiscountableAtBilling() { if (selectedList == null || selectedList.isEmpty()) { @@ -1082,7 +1080,7 @@ public void unMarkSelectedItemsForPrintSeparateFees() { } JsfUtil.addSuccessMessage("All Unmarked for Print Separate Fees"); } - + public void addSessionNumberType() { if (selectedList == null || selectedList.isEmpty()) { JsfUtil.addErrorMessage("Nothing is selected"); @@ -1720,15 +1718,63 @@ public List completeAmpAndVmpItem(String query) { } public List fillpackages() { - List suggestions; String sql; sql = "select c from Item c where c.retired=false" + " and (c.inactive=false or c.inactive is null) " + " and type(c)=Packege " + " order by c.name"; - //////// // System.out.println(sql); packaes = getFacade().findByJpql(sql); - //System.out.println("packaes = " + packaes); + System.out.println("fillpackages - packaes = " + packaes.size()); + return packaes; + } + + public List fillpackages(Sex gender) { + + System.out.println("Load Fillpackages with Gender"); + String sex = null; + + if (gender == null) { + sex = ""; + } + + if (gender != null) { + switch (gender) { + case Female: + sex = "Female"; + break; + case Male: + sex = "Male"; + break; + default: + sex = "Both"; + break; + } + } + + System.out.println("sex = " + sex); + + String jpql; + + jpql = "select c from Item c where c.retired=false" + + " and (c.inactive=false or c.inactive is null) " + + " and type(c)=Packege "; + + if ("Both".equals(sex)) { + jpql += " and c.forGender in ('Both','Male','Female') "; + } + + if ("Male".equals(sex)) { + jpql += " and c.forGender in ('Both','Male') "; + } + + if ("Female".equals(sex)) { + jpql += " and c.forGender in ('Both','Female') "; + } + + jpql += " order by c.name"; + + packaes = getFacade().findByJpql(jpql); + System.out.println("Fillpackages with Gender packaes = " + packaes.size()); return packaes; } @@ -3052,14 +3098,23 @@ public Department getFilterDepartment() { public void setFilterDepartment(Department filterDepartment) { this.filterDepartment = filterDepartment; - } public List getPackaes() { - if (packaes == null) { - packaes = fillpackages(); + if (configOptionApplicationController.getBooleanValueByKey("Package bill – Reloading of Packages with Consideration of Gender")) { + System.out.println("Gender = " + patientGender); + if (packaes == null) { + packaes = new ArrayList(); + } else { + packaes.clear(); + } + } else { + if (packaes == null) { + packaes = fillpackages(); + } } - // System.out.println("getPackaes = " + packaes); + + System.out.println("Packaes = " + packaes.size()); return packaes; } @@ -3075,6 +3130,14 @@ public void setSuggestItems(List suggestItems) { this.suggestItems = suggestItems; } + public Sex getPatientGender() { + return patientGender; + } + + public void setPatientGender(Sex patientGender) { + this.patientGender = patientGender; + } + @FacesConverter("itemLightConverter") public static class ItemLightConverter implements Converter { diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml index aed333c8ee..b1165dd984 100644 --- a/src/main/webapp/opd/opd_bill_package.xhtml +++ b/src/main/webapp/opd/opd_bill_package.xhtml @@ -47,36 +47,31 @@ - - - - - +
+
+ + +
+ + + + +
+ + + + + @@ -100,6 +103,7 @@ process="advanced btnAddIx" update="tblBillItem pBillDetails pIxAdd msg" icon="fa fa-plus" + style="" class=" mx-1 ui-button-success my-2" action="#{billPackageController.addToBill()}" > @@ -108,118 +112,118 @@ - - - - - - - - -
- - -
- - - + - - No - #{rowIndex+1} - - - Item - #{bi.billItem.item.name} - - - Fee - - - - - - Department - #{bi.billItem.item.department.name} - - +
+
+ + + + + + + + +
+ - - - - - - - - No - #{rowIndex+1} - - - Name - #{bix.item.name} - - - - - - - - No - #{rowIndex+1} - - - - Item - - - - - Fee - - - - - - - Payee - - - - - - - - - - - - - -
+ action="#{billPackageController.removeBillItem}" + ajax="false" /> +
+ + + + + + No + #{rowIndex+1} + + + Item + #{bi.billItem.item.name} + + + Fee + + + + + + Department + #{bi.billItem.item.department.name} + + + + + + + + + + + No + #{rowIndex+1} + + + Name + #{bix.item.name} + + + + + + + + No + #{rowIndex+1} + + + + Item + + + + + Fee + + + + + + + Payee + + + + + + + + + + + + -
-
From 8cd0a29f2772ea053b7d5aed5563d5ef3a597fa6 Mon Sep 17 00:00:00 2001 From: buddhika75 Date: Sun, 21 Jul 2024 21:05:05 +0530 Subject: [PATCH 2/8] Signed-off-by: buddhika75 --- pom.xml | 4 +- .../bean/common/BillPackageController.java | 108 ++++- .../divudi/bean/common/ItemController.java | 70 +--- src/main/java/com/divudi/entity/Item.java | 3 + src/main/resources/META-INF/persistence.xml | 4 +- .../webapp/admin/pricing/package_name.xhtml | 1 + src/main/webapp/opd/opd_bill_package.xhtml | 393 +++++++++++++++++- 7 files changed, 495 insertions(+), 88 deletions(-) diff --git a/pom.xml b/pom.xml index 353cd12134..788b77ee8d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.divudi - sethmademo + ruhunu-dev 3.0.0 war - sethmademo + ruhunu-dev ${project.build.directory}/endorsed diff --git a/src/main/java/com/divudi/bean/common/BillPackageController.java b/src/main/java/com/divudi/bean/common/BillPackageController.java index b987d9e1ca..929128cc10 100644 --- a/src/main/java/com/divudi/bean/common/BillPackageController.java +++ b/src/main/java/com/divudi/bean/common/BillPackageController.java @@ -125,6 +125,11 @@ public class BillPackageController implements Serializable, ControllerWithPatien @Inject ConfigOptionApplicationController configOptionApplicationController; + private List malePackaes; + private List femalePackaes; + private List bothPackaes; + private List packaes; + // // private static final long serialVersionUID = 1L; @@ -894,12 +899,6 @@ public void clearBillValues() { setDiscount(0.0); setCashBalance(0.0); printPreview = false; - if (configOptionApplicationController.getBooleanValueByKey("Package bill – Reloading of Packages with Consideration of Gender")) { - itemController.getPackaes().clear(); - System.out.println("Page Loading"); - } else { - itemController.getPackaes(); - } } public void prepareNewBill() { @@ -1454,4 +1453,101 @@ public void setToStaff(Staff toStaff) { this.toStaff = toStaff; } + public List getMalePackaes() { + return malePackaes; + } + + public void setMalePackaes(List malePackaes) { + this.malePackaes = malePackaes; + } + + public List getFemalePackaes() { + return femalePackaes; + } + + public void setFemalePackaes(List femalePackaes) { + this.femalePackaes = femalePackaes; + } + + public List getBothPackaes() { + return bothPackaes; + } + + public void setBothPackaes(List bothPackaes) { + this.bothPackaes = bothPackaes; + } + + + + public List getGenderBasedPackaes() { + System.out.println("getPackages"); + if (packaes == null) { + fillPackages(); + } + if (configOptionApplicationController.getBooleanValueByKey("Package bill – Reloading of Packages with Consideration of Gender")) { + System.out.println("option ok"); + if (getPatient() == null) { + System.out.println("pt is null"); + return packaes; + } else if (getPatient().getPerson().getSex() == null) { + System.out.println("sex is null"); + return bothPackaes; + } else if (getPatient().getPerson().getSex() == Sex.Male) { + System.out.println("males"); + return malePackaes; + } else if (getPatient().getPerson().getSex() == Sex.Female) { + System.out.println("females"); + return femalePackaes; + } else { + return bothPackaes; + } + } + return packaes; + } + + public void setPackaes(List packaes) { + this.packaes = packaes; + } + + public List getPackaes() { + if(packaes==null){ + packaes=itemController.getPackaes(); + fillPackages(); + } + return packaes; + } + + private void fillPackages() { + System.out.println("fillPackages"); + packaes = itemController.getPackaes(); + System.out.println("packaes = " + packaes); + if (packaes == null) { + return; + } + malePackaes = new ArrayList<>(); + femalePackaes = new ArrayList<>(); + bothPackaes = new ArrayList<>(); + for (Item i : packaes) { + System.out.println("i = " + i); + if (i.getForGender() == null) { + System.out.println("gender nill"); + bothPackaes.add(i); + } else if (i.getForGender().equalsIgnoreCase("Male")) { + System.out.println("mp = " ); + malePackaes.add(i); + } else if (i.getForGender().equalsIgnoreCase("Female")) { + System.out.println("fp = " ); + femalePackaes.add(i); + } else if (i.getForGender().equalsIgnoreCase("Both")) { + bothPackaes.add(i); + malePackaes.add(i); + femalePackaes.add(i); + } else { + bothPackaes.add(i); + } + } + } + + + } diff --git a/src/main/java/com/divudi/bean/common/ItemController.java b/src/main/java/com/divudi/bean/common/ItemController.java index f8dff25c48..9cb9bdc9fc 100644 --- a/src/main/java/com/divudi/bean/common/ItemController.java +++ b/src/main/java/com/divudi/bean/common/ItemController.java @@ -1723,61 +1723,16 @@ public List fillpackages() { + " and (c.inactive=false or c.inactive is null) " + " and type(c)=Packege " + " order by c.name"; + System.out.println("sql = " + sql); packaes = getFacade().findByJpql(sql); - System.out.println("fillpackages - packaes = " + packaes.size()); - return packaes; - } - - public List fillpackages(Sex gender) { - - System.out.println("Load Fillpackages with Gender"); - String sex = null; - - if (gender == null) { - sex = ""; - } - - if (gender != null) { - switch (gender) { - case Female: - sex = "Female"; - break; - case Male: - sex = "Male"; - break; - default: - sex = "Both"; - break; - } - } - - System.out.println("sex = " + sex); - - String jpql; - - jpql = "select c from Item c where c.retired=false" - + " and (c.inactive=false or c.inactive is null) " - + " and type(c)=Packege "; - - if ("Both".equals(sex)) { - jpql += " and c.forGender in ('Both','Male','Female') "; - } - - if ("Male".equals(sex)) { - jpql += " and c.forGender in ('Both','Male') "; - } - - if ("Female".equals(sex)) { - jpql += " and c.forGender in ('Both','Female') "; + System.out.println("packaes = " + packaes); + if (packaes == null) { + return new ArrayList<>(); } - - jpql += " order by c.name"; - - packaes = getFacade().findByJpql(jpql); - System.out.println("Fillpackages with Gender packaes = " + packaes.size()); return packaes; } + public List completePackage(String query) { List suggestions; String sql; @@ -3101,20 +3056,9 @@ public void setFilterDepartment(Department filterDepartment) { } public List getPackaes() { - if (configOptionApplicationController.getBooleanValueByKey("Package bill – Reloading of Packages with Consideration of Gender")) { - System.out.println("Gender = " + patientGender); - if (packaes == null) { - packaes = new ArrayList(); - } else { - packaes.clear(); - } - } else { - if (packaes == null) { - packaes = fillpackages(); - } + if (packaes == null) { + packaes = fillpackages(); } - - System.out.println("Packaes = " + packaes.size()); return packaes; } diff --git a/src/main/java/com/divudi/entity/Item.java b/src/main/java/com/divudi/entity/Item.java index 6f32cccd5c..4e025c8647 100644 --- a/src/main/java/com/divudi/entity/Item.java +++ b/src/main/java/com/divudi/entity/Item.java @@ -1398,6 +1398,9 @@ public void setCanRemoveItemfromPackage(boolean canRemoveItemfromPackage) { } public String getForGender() { + if(forGender==null||forGender.trim().equals("")){ + forGender = "Both"; + } return forGender; } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index f10263e018..987c7976f9 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,14 +1,14 @@ - jdbc/arogya + jdbc/ruhunuDemo false - jdbc/arogyaAudit + jdbc/ruhunuDemoAudit false diff --git a/src/main/webapp/admin/pricing/package_name.xhtml b/src/main/webapp/admin/pricing/package_name.xhtml index 8c18479dac..74e689512c 100644 --- a/src/main/webapp/admin/pricing/package_name.xhtml +++ b/src/main/webapp/admin/pricing/package_name.xhtml @@ -91,6 +91,7 @@ id="cmbSex" value="#{packageNameController.current.forGender}" class="w-100"> + diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml index b1165dd984..ef37bd86e1 100644 --- a/src/main/webapp/opd/opd_bill_package.xhtml +++ b/src/main/webapp/opd/opd_bill_package.xhtml @@ -9,7 +9,8 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ez="http://xmlns.jcp.org/jsf/composite/ezcomp" xmlns:pa="http://xmlns.jcp.org/jsf/composite/paymentMethod" - xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common"> + xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common" + xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> > @@ -39,7 +40,380 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #{ps.person.name} + + + #{ps.person.phone} + + + #{ps.person.mobile} + + + + + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + + +
+
+ +
+
+ + + + + + + +
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ +
+
+ +
+
+ +
+ + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52,20 +426,9 @@
- - - -
- - + From d916f2f1027806172972fb2242d738042a39afb5 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 21:41:48 +0530 Subject: [PATCH 3/8] Signed-off-by: DamithDeshan --- src/main/webapp/opd/opd_bill_package.xhtml | 37 +++------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml index ef37bd86e1..e451d7a7d5 100644 --- a/src/main/webapp/opd/opd_bill_package.xhtml +++ b/src/main/webapp/opd/opd_bill_package.xhtml @@ -78,9 +78,6 @@ - - - @@ -421,12 +418,8 @@ -
-
- - -
-
+ +
-
- +
- +
@@ -1007,7 +979,6 @@
From b74a51221f2bde4cfa67cfd855944d0c55a56bc5 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 21:41:52 +0530 Subject: [PATCH 4/8] Signed-off-by: DamithDeshan --- pom.xml | 2 +- src/main/resources/META-INF/persistence.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 788b77ee8d..360d33f8a9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ ruhunu-dev 3.0.0 war - ruhunu-dev + hmis ${project.build.directory}/endorsed diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 987c7976f9..f10263e018 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,14 +1,14 @@ - jdbc/ruhunuDemo + jdbc/arogya false - jdbc/ruhunuDemoAudit + jdbc/arogyaAudit false From c634c3ad85282ae14b6c3ec59dba0edb176613eb Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 21:42:17 +0530 Subject: [PATCH 5/8] closes#6486 --- .../bean/common/BillPackageController.java | 37 +++++-------- .../divudi/bean/common/ItemController.java | 53 +++---------------- 2 files changed, 21 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/divudi/bean/common/BillPackageController.java b/src/main/java/com/divudi/bean/common/BillPackageController.java index 929128cc10..550857e2b3 100644 --- a/src/main/java/com/divudi/bean/common/BillPackageController.java +++ b/src/main/java/com/divudi/bean/common/BillPackageController.java @@ -226,7 +226,6 @@ public void putToBills() { } } myBill.setBillItems(list); - //////System.out.println("555"); getBillBean().calculateBillItems(myBill, tmp); bills.add(myBill); } @@ -293,7 +292,6 @@ public void cancellAll() { getBillSearch().setBill((BilledBill) b); getBillSearch().setPaymentMethod(b.getPaymentMethod()); getBillSearch().setComment("Batch Cancell"); - //////System.out.println("ggg : " + getBillSearch().getComment()); getBillSearch().cancelOpdBill(); } @@ -307,9 +305,7 @@ public void cancellAll() { private void saveBillItemSessions() { for (BillEntry be : lstBillEntries) { BillItem temBi = be.getBillItem(); - ////System.out.println("temBi = " + temBi); BillSession temBs = getServiceSessionBean().createBillSession(temBi); - ////System.out.println("temBs = " + temBs); temBi.setBillSession(temBs); if (temBs != null) { getBillSessionFacade().create(temBs); @@ -331,9 +327,7 @@ public void settleBill() { getBills().add(b); } else { - // //////System.out.println("11"); putToBills(); - // //////System.out.println("22"); } saveBatchBill(); @@ -359,7 +353,6 @@ public void settleBill() { saveBillItemSessions(); clearBillItemValues(); - //////System.out.println("33"); JsfUtil.addSuccessMessage( "Bill Saved"); @@ -803,8 +796,6 @@ private void addEntry(BillItem bi) { } public void addToBill() { -// System.out.println("getCurrentBillItem = " + getCurrentBillItem()); -// System.out.println("getCurrentBillItem.item = " + getCurrentBillItem().getItem().getName()); if (getLstBillEntries().size() > 0) { JsfUtil.addErrorMessage("You can not add more than on package at a time create new bill"); return; @@ -950,7 +941,7 @@ public void recreateList(BillEntry r) { for (BillEntry b : getLstBillEntries()) { if (b.getBillItem().getItem() != r.getBillItem().getItem()) { temp.add(b); - //////System.out.println(b.getBillItem().getNetValue()); + } } lstBillEntries = temp; @@ -1480,23 +1471,23 @@ public void setBothPackaes(List bothPackaes) { public List getGenderBasedPackaes() { - System.out.println("getPackages"); + //System.out.println("getPackages"); if (packaes == null) { fillPackages(); } if (configOptionApplicationController.getBooleanValueByKey("Package bill – Reloading of Packages with Consideration of Gender")) { - System.out.println("option ok"); + //System.out.println("option ok"); if (getPatient() == null) { - System.out.println("pt is null"); + //System.out.println("pt is null"); return packaes; } else if (getPatient().getPerson().getSex() == null) { - System.out.println("sex is null"); - return bothPackaes; + //System.out.println("sex is null"); + return packaes; } else if (getPatient().getPerson().getSex() == Sex.Male) { - System.out.println("males"); + //System.out.println("males"); return malePackaes; } else if (getPatient().getPerson().getSex() == Sex.Female) { - System.out.println("females"); + //System.out.println("females"); return femalePackaes; } else { return bothPackaes; @@ -1518,9 +1509,9 @@ public List getPackaes() { } private void fillPackages() { - System.out.println("fillPackages"); + //System.out.println("fillPackages"); packaes = itemController.getPackaes(); - System.out.println("packaes = " + packaes); + //System.out.println("packaes = " + packaes); if (packaes == null) { return; } @@ -1528,15 +1519,15 @@ private void fillPackages() { femalePackaes = new ArrayList<>(); bothPackaes = new ArrayList<>(); for (Item i : packaes) { - System.out.println("i = " + i); + //System.out.println("i = " + i); if (i.getForGender() == null) { - System.out.println("gender nill"); + //System.out.println("gender nill"); bothPackaes.add(i); } else if (i.getForGender().equalsIgnoreCase("Male")) { - System.out.println("mp = " ); + //System.out.println("mp = " ); malePackaes.add(i); } else if (i.getForGender().equalsIgnoreCase("Female")) { - System.out.println("fp = " ); + //System.out.println("fp = " ); femalePackaes.add(i); } else if (i.getForGender().equalsIgnoreCase("Both")) { bothPackaes.add(i); diff --git a/src/main/java/com/divudi/bean/common/ItemController.java b/src/main/java/com/divudi/bean/common/ItemController.java index 9cb9bdc9fc..8508decc0e 100644 --- a/src/main/java/com/divudi/bean/common/ItemController.java +++ b/src/main/java/com/divudi/bean/common/ItemController.java @@ -1158,7 +1158,6 @@ public void setDepartments(List departments) { } public void createNewItemsFromMasterItems() { - ////// // System.out.println("createNewItemsFromMasterItems"); if (institution == null) { JsfUtil.addErrorMessage("Select institution"); return; @@ -1172,7 +1171,6 @@ public void createNewItemsFromMasterItems() { return; } for (Item i : selectedList) { - ////// // System.out.println("i.getName() = " + i.getName()); Item ni = null; if (i instanceof Investigation) { try { @@ -1201,13 +1199,9 @@ public void createNewItemsFromMasterItems() { ni.setItemFee(null); getFacade().create(ni); i.setItemFees(itemFeeManager.fillFees(i)); - ////// // System.out.println("ni = " + ni); - ////// // System.out.println("i.getItemFees() = " + i.getItemFees()); - ////// // System.out.println("ni.getItemFees() = " + ni.getItemFees()); for (ItemFee f : i.getItemFees()) { ItemFee nf = new ItemFee(); - ////// // System.out.println("f = " + f); try { BeanUtils.copyProperties(nf, f); } catch (IllegalAccessException | InvocationTargetException ex) { @@ -1223,7 +1217,6 @@ public void createNewItemsFromMasterItems() { nf.setItem(ni); ni.getItemFees().add(nf); getItemFeeFacade().create(nf); - ////// // System.out.println("nf = " + nf); } getFacade().edit(ni); List ifis = itemForItemController.getItemsForParentItem(i); @@ -1236,7 +1229,6 @@ public void createNewItemsFromMasterItems() { ifin.setCreater(getSessionController().getLoggedUser()); } } - ////// // System.out.println("ni.getItemFees() = " + ni.getItemFees()); } } @@ -1311,7 +1303,6 @@ public List completeDealorItem(String query) { + " (c.item.barcode) like :q or (c.item.code) like :q )order by c.item.name"; hm.put("ins", getInstitution()); hm.put("q", "%" + query + "%"); - //////// // System.out.println(sql); suggestions = getFacade().findByJpql(sql, hm, 20); } return suggestions; @@ -1328,7 +1319,6 @@ public List getDealorItem() { + " order by c.item.name"; hm.put("ins", getInstitution()); - //////// // System.out.println(sql); suggestions = getFacade().findByJpql(sql, hm); return suggestions; @@ -1417,24 +1407,6 @@ public List completeMasterItems(String query) { public List completeItem(String query) { return completeItem(query, null, null, 20); -// List suggestions; -// String sql; -// HashMap hm = new HashMap(); -// if (query == null) { -// suggestions = new ArrayList<>(); -// } else { -// sql = "select c from Item c " -// + " where c.retired=false" -// + " and ((c.name) like :q" -// + " or (c.barcode) like :q" -// + " or (c.code) like :q )" -// + " order by c.name"; -// hm.put("q", "%" + query.toUpperCase() + "%"); -////////// // System.out.println(sql); -// suggestions = getFacade().findByJpql(sql, hm, 20); -// } -// return suggestions; -// } List itemList; @@ -1663,7 +1635,6 @@ public List fetchStoreItem() { + " (type(c)= :amp) " + " and c.departmentType=:dep " + " order by c.name"; - //////// // System.out.println(sql); tmpMap.put("amp", Amp.class); tmpMap.put("dep", DepartmentType.Store); @@ -1686,7 +1657,6 @@ public List completeAmpAndAmppItem(String query) { sql = "select c from Item c where c.retired=false and (type(c)= :amp or type(c)=:ampp ) and ((c.name) like '%" + query.toUpperCase() + "%' or (c.code) like '%" + query.toUpperCase() + "%') order by c.name"; } -//////// // System.out.println(sql); tmpMap.put("amp", Amp.class); tmpMap.put("ampp", Ampp.class); suggestions = getFacade().findByJpql(sql, tmpMap, TemporalType.TIMESTAMP, 30); @@ -1723,9 +1693,9 @@ public List fillpackages() { + " and (c.inactive=false or c.inactive is null) " + " and type(c)=Packege " + " order by c.name"; - System.out.println("sql = " + sql); + //System.out.println("sql = " + sql); packaes = getFacade().findByJpql(sql); - System.out.println("packaes = " + packaes); + //System.out.println("packaes = " + packaes); if (packaes == null) { return new ArrayList<>(); } @@ -1743,7 +1713,6 @@ public List completePackage(String query) { + " and (c.inactive=false or c.inactive is null) " + "and type(c)=Packege " + "and (c.name) like '%" + query.toUpperCase() + "%' order by c.name"; - //////// // System.out.println(sql); suggestions = getFacade().findByJpql(sql); } return suggestions; @@ -1921,7 +1890,6 @@ public List completeInwardItems(String query) { m.put("ward", InwardService.class); m.put("the", TheatreService.class); m.put("q", "%" + query.toUpperCase() + "%"); - // //////// // System.out.println(sql); suggestions = getFacade().findByJpql(sql, m, 20); } return suggestions; @@ -1944,7 +1912,6 @@ public void fillItemsForInward() { m.put("inv", Investigation.class); m.put("ward", InwardService.class); m.put("the", TheatreService.class); - // //////// // System.out.println(sql); suggestItems = getFacade().findByJpql(sql, m); } @@ -1977,7 +1944,6 @@ public List completeTheatreItems(String query) { // m.put("inv", Investigation.class); m.put("the", TheatreService.class); m.put("q", "%" + query.toUpperCase() + "%"); - // //////// // System.out.println(sql); suggestions = getFacade().findByJpql(sql, m, 20); } return suggestions; @@ -2160,10 +2126,8 @@ public List completeOpdItemsByNamesAndCodeInstitutionSpecificOrNotSpecific m.put("inv", Investigation.class); m.put("q", "%" + query.toUpperCase() + "%"); -// //// // System.out.println(sql); -// //// // System.out.println("m = " + m); mySuggestions = getFacade().findByJpql(sql, m, 20); -// //// // System.out.println("mySuggestions = " + mySuggestions); + return mySuggestions; } @@ -2226,7 +2190,7 @@ public List completeServicesPlusInvestigationsAll(String query) { m.put("ser", Service.class); m.put("inv", Investigation.class); m.put("q", "%" + query.toUpperCase() + "%"); - // //////// // System.out.println(sql); + mySuggestions = getFacade().findByJpql(sql, m, 20); } return mySuggestions; @@ -2279,7 +2243,7 @@ public List completeOpdItemsForItemListringStrategyLoggedInstitution(Strin m.put("ins", sessionController.getInstitution()); m.put("q", "%" + query.toUpperCase() + "%"); - // //////// // System.out.println(sql); + mySuggestions = getFacade().findByJpql(sql, m, 20); } return mySuggestions; @@ -2292,7 +2256,7 @@ public List completeItemWithoutPackOwn(String query) { suggestions = new ArrayList(); } else { sql = "select c from Item c where c.institution.id = " + getSessionController().getInstitution().getId() + " and c.retired=false and type(c)!=Packege and type(c)!=TimedItem and (c.name) like '%" + query.toUpperCase() + "%' order by c.name"; - //////// // System.out.println(sql); + suggestions = getFacade().findByJpql(sql); } return suggestions; @@ -2300,9 +2264,7 @@ public List completeItemWithoutPackOwn(String query) { public void makeSelectedAsMasterItems() { for (Item i : selectedList) { - ////// // System.out.println("i = " + i.getInstitution()); if (i.getInstitution() != null) { - ////// // System.out.println("i = " + i.getInstitution().getName()); i.setInstitution(null); getFacade().edit(i); } @@ -2331,7 +2293,6 @@ public List fetchOPDItemList(boolean ins) { m.put("inw", InwardService.class); m.put("ser", Service.class); m.put("inv", Investigation.class); - ////// // System.out.println(sql); items = getFacade().findByJpql(sql, m); return items; } @@ -2363,7 +2324,7 @@ public List fetchOPDItemFeeList(boolean ins, FeeType ftype) { m.put("inw", InwardService.class); m.put("ser", Service.class); m.put("inv", Investigation.class); - ////// // System.out.println(sql); + itemFees = getItemFeeFacade().findByJpql(sql, m); return itemFees; } From 61e1b07cd456e0506c1e2b1889ce3c0e2d526dc6 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 23:01:38 +0530 Subject: [PATCH 6/8] Signed-off-by: DamithDeshan --- src/main/webapp/opd/opd_bill_package.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml index e451d7a7d5..efd22995b1 100644 --- a/src/main/webapp/opd/opd_bill_package.xhtml +++ b/src/main/webapp/opd/opd_bill_package.xhtml @@ -130,7 +130,7 @@ action="#{patientController.selectQuickOneFromQuickSearchPatient(billPackageController)}" id="btnSelectPt" process="btnSelectPt tblPatients" - update=":#{p:resolveFirstComponentWithId('ptImp',view).clientId}" + update=":#{p:resolveFirstComponentWithId('ptImp',view).clientId} :#{p:resolveFirstComponentWithId('advanced',view).clientId}" value="select"> From b714a2ca6cf956b7c104161bc60118ac0d6b0733 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sun, 21 Jul 2024 23:18:31 +0530 Subject: [PATCH 7/8] Signed-off-by: DamithDeshan --- .../bean/cashTransaction/FinancialTransactionController.java | 5 ----- src/main/resources/META-INF/persistence.xml | 4 ++-- src/main/webapp/opd/opd_bill_package.xhtml | 5 +++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java index 9fdf181f64..5e2f98a257 100644 --- a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java +++ b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java @@ -139,11 +139,6 @@ public class FinancialTransactionController implements Serializable { private ReportTemplateRowBundle paymentSummaryBundle; - private Date fromDate; - private Date toDate; - - private ReportTemplateRowBundle paymentSummaryBundle; - // // public FinancialTransactionController() { diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 42fe5625f4..6d8623993e 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,14 +2,14 @@ - jdbc/hims + jdbc/arogya false - jdbc/himsAduit + jdbc/arogyaAudit false diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml index efd22995b1..b43d34c204 100644 --- a/src/main/webapp/opd/opd_bill_package.xhtml +++ b/src/main/webapp/opd/opd_bill_package.xhtml @@ -421,7 +421,7 @@ - + 11205 #{configOptionApplicationController.getBooleanValueByKey('Package bill – Reloading of Packages with Consideration of Gender')} - + + Date: Sun, 21 Jul 2024 23:21:16 +0530 Subject: [PATCH 8/8] Signed-off-by: DamithDeshan --- src/main/webapp/opd/opd_bill_package.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/opd/opd_bill_package.xhtml b/src/main/webapp/opd/opd_bill_package.xhtml index b43d34c204..abcdba8ea6 100644 --- a/src/main/webapp/opd/opd_bill_package.xhtml +++ b/src/main/webapp/opd/opd_bill_package.xhtml @@ -421,7 +421,7 @@ - 11205 #{configOptionApplicationController.getBooleanValueByKey('Package bill – Reloading of Packages with Consideration of Gender')} +