Skip to content

⚡ Optimize database access with batch operations in PharmacyBillSearch #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ManupaKDU merged 1 commit into from
Jun 12, 2026
Merged

⚡ Optimize database access with batch operations in PharmacyBillSearch #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
239 changes: 239 additions & 0 deletions patch_file.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
<<<<<<< SEARCH
private void pharmacyCancelBillItemsAddStock(CancelledBill can) {
for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);

if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}

b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());

PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());

if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().create(ph);
}

b.setPharmaceuticalBillItem(ph);

if (b.getId() == null) {
getBillItemFacede().create(b);
}

ph.setBillItem(b);
getPharmaceuticalBillItemFacade().edit(ph);

// updateRemainingQty(nB);
// b.setPharmaceuticalBillItem(b.getReferanceBillItem().getPharmaceuticalBillItem());
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
//System.err.println("Updating QTY " + qty);
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());

getBillItemFacede().edit(b);

can.getBillItems().add(b);
}

getBillFacade().edit(can);
}

private void pharmacyCancelBillItemsAddStock(CancelledBill can, Payment p) {
for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);

if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}

b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());

PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());

if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().create(ph);
}

b.setPharmaceuticalBillItem(ph);

if (b.getId() == null) {
getBillItemFacede().create(b);
}

ph.setBillItem(b);
getPharmaceuticalBillItemFacade().edit(ph);

// updateRemainingQty(nB);
// b.setPharmaceuticalBillItem(b.getReferanceBillItem().getPharmaceuticalBillItem());
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
//System.err.println("Updating QTY " + qty);
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());

getBillItemFacede().edit(b);
//get billfees from using cancel billItem
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + nB.getId();
List<BillFee> tmp = getBillFeeFacade().findByJpql(sql);
cancelBillFee(can, b, tmp);

//create BillFeePayments For cancel
sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + b.getId();
List<BillFee> tmpC = getBillFeeFacade().findByJpql(sql);
// calculateBillfeePaymentsForCancelRefundBill(tmpC, p);
//

can.getBillItems().add(b);
}

getBillFacade().edit(can);
}
=======
private void pharmacyCancelBillItemsAddStock(CancelledBill can) {
List<PharmaceuticalBillItem> phsToBatch = new ArrayList<>();
List<BillItem> bsToBatch = new ArrayList<>();

for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);

if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}

b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());

PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());

// Create entities and immediately flush to database to generate IDs
// This is required because getPharmacyBean().addToStock depends on persisted entities
if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().createAndFlush(ph);
}

b.setPharmaceuticalBillItem(ph);

if (b.getId() == null) {
getBillItemFacede().createAndFlush(b);
}

ph.setBillItem(b);
phsToBatch.add(ph);

double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());

bsToBatch.add(b);
can.getBillItems().add(b);
}

getPharmaceuticalBillItemFacade().batchEdit(phsToBatch);
getBillItemFacede().batchEdit(bsToBatch);

getBillFacade().edit(can);
}

private void pharmacyCancelBillItemsAddStock(CancelledBill can, Payment p) {
List<Long> billItemIds = new ArrayList<>();
for (BillItem nB : getBill().getBillItems()) {
if (nB.getId() != null) {
billItemIds.add(nB.getId());
}
}

Map<Long, List<BillFee>> billFeesMap = new HashMap<>();
if (!billItemIds.isEmpty()) {
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id IN :ids";
Map<String, Object> m = new HashMap<>();
m.put("ids", billItemIds);
List<BillFee> allBillFees = getBillFeeFacade().findByJpql(sql, m);
for (BillFee bf : allBillFees) {
if (bf.getBillItem() != null && bf.getBillItem().getId() != null) {
billFeesMap.computeIfAbsent(bf.getBillItem().getId(), k -> new ArrayList<>()).add(bf);
}
}
}

List<PharmaceuticalBillItem> phsToBatch = new ArrayList<>();
List<BillItem> bsToBatch = new ArrayList<>();

for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
b.copy(nB);
b.invertValue(nB);

if (can.getBillType() == BillType.PharmacyGrnBill || can.getBillType() == BillType.PharmacyGrnReturn) {
b.setReferanceBillItem(nB.getReferanceBillItem());
} else {
b.setReferanceBillItem(nB);
}

b.setCreatedAt(new Date());
b.setCreater(getSessionController().getLoggedUser());

PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
ph.copy(nB.getPharmaceuticalBillItem());
ph.invertValue(nB.getPharmaceuticalBillItem());

// Create entities and immediately flush to database to generate IDs
// This is required because getPharmacyBean().addToStock depends on persisted entities
if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().createAndFlush(ph);
}

b.setPharmaceuticalBillItem(ph);

if (b.getId() == null) {
getBillItemFacede().createAndFlush(b);
}

ph.setBillItem(b);
phsToBatch.add(ph);

double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());

bsToBatch.add(b);

List<BillFee> tmp = billFeesMap.getOrDefault(nB.getId(), new ArrayList<>());
cancelBillFee(can, b, tmp);

can.getBillItems().add(b);
}

getPharmaceuticalBillItemFacade().batchEdit(phsToBatch);
getBillItemFacede().batchEdit(bsToBatch);

getBillFacade().edit(can);
}
>>>>>>> REPLACE
65 changes: 41 additions & 24 deletions src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1927,6 +1927,9 @@ private RefundBill pharmacyCreateRefundCancelBill() {
//
// }
private void pharmacyCancelBillItemsAddStock(CancelledBill can) {
List<PharmaceuticalBillItem> phsToBatch = new ArrayList<>();
List<BillItem> bsToBatch = new ArrayList<>();

for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
Expand All @@ -1947,35 +1950,57 @@ private void pharmacyCancelBillItemsAddStock(CancelledBill can) {
ph.invertValue(nB.getPharmaceuticalBillItem());

if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().create(ph);
getPharmaceuticalBillItemFacade().createAndFlush(ph);
}

b.setPharmaceuticalBillItem(ph);

if (b.getId() == null) {
getBillItemFacede().create(b);
getBillItemFacede().createAndFlush(b);
}

ph.setBillItem(b);
getPharmaceuticalBillItemFacade().edit(ph);

// updateRemainingQty(nB);
// b.setPharmaceuticalBillItem(b.getReferanceBillItem().getPharmaceuticalBillItem());
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
//System.err.println("Updating QTY " + qty);
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());

getBillItemFacede().edit(b);

phsToBatch.add(ph);
bsToBatch.add(b);
can.getBillItems().add(b);
}

getPharmaceuticalBillItemFacade().batchEdit(phsToBatch);
getBillItemFacede().batchEdit(bsToBatch);

getBillFacade().edit(can);
}

private void pharmacyCancelBillItemsAddStock(CancelledBill can, Payment p) {
List<Long> billItemIds = new ArrayList<>();
for (BillItem nB : getBill().getBillItems()) {
if (nB.getId() != null) {
billItemIds.add(nB.getId());
}
}

Map<Long, List<BillFee>> billFeesMap = new HashMap<>();
if (!billItemIds.isEmpty()) {
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id IN :ids";
Map<String, Object> m = new HashMap<>();
m.put("ids", billItemIds);
List<BillFee> allBillFees = getBillFeeFacade().findByJpql(sql, m);
for (BillFee bf : allBillFees) {
if (bf.getBillItem() != null && bf.getBillItem().getId() != null) {
billFeesMap.computeIfAbsent(bf.getBillItem().getId(), k -> new ArrayList<>()).add(bf);
}
}
}

List<PharmaceuticalBillItem> phsToBatch = new ArrayList<>();
List<BillItem> bsToBatch = new ArrayList<>();

for (BillItem nB : getBill().getBillItems()) {
BillItem b = new BillItem();
b.setBill(can);
Expand All @@ -1996,41 +2021,33 @@ private void pharmacyCancelBillItemsAddStock(CancelledBill can, Payment p) {
ph.invertValue(nB.getPharmaceuticalBillItem());

if (ph.getId() == null) {
getPharmaceuticalBillItemFacade().create(ph);
getPharmaceuticalBillItemFacade().createAndFlush(ph);
}

b.setPharmaceuticalBillItem(ph);

if (b.getId() == null) {
getBillItemFacede().create(b);
getBillItemFacede().createAndFlush(b);
}

ph.setBillItem(b);
getPharmaceuticalBillItemFacade().edit(ph);

// updateRemainingQty(nB);
// b.setPharmaceuticalBillItem(b.getReferanceBillItem().getPharmaceuticalBillItem());
double qty = ph.getFreeQtyInUnit() + ph.getQtyInUnit();
//System.err.println("Updating QTY " + qty);
getPharmacyBean().addToStock(ph.getStock(),
Math.abs(qty),
ph, getSessionController().getDepartment());

getBillItemFacede().edit(b);
//get billfees from using cancel billItem
String sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + nB.getId();
List<BillFee> tmp = getBillFeeFacade().findByJpql(sql);
List<BillFee> tmp = billFeesMap.getOrDefault(nB.getId(), new ArrayList<>());
cancelBillFee(can, b, tmp);

//create BillFeePayments For cancel
sql = "Select bf From BillFee bf where bf.retired=false and bf.billItem.id=" + b.getId();
List<BillFee> tmpC = getBillFeeFacade().findByJpql(sql);
// calculateBillfeePaymentsForCancelRefundBill(tmpC, p);
//

phsToBatch.add(ph);
bsToBatch.add(b);
can.getBillItems().add(b);
}

getPharmaceuticalBillItemFacade().batchEdit(phsToBatch);
getBillItemFacede().batchEdit(bsToBatch);

getBillFacade().edit(can);
}

Expand Down
Loading