Skip to content

Commit dc0d1d6

Browse files
GSMgeethGSMgeeth
authored
Merge pull request #11350 from hmislk/development
Updates from development
2 parents c32cbe9 + 8e4146d commit dc0d1d6

File tree

104 files changed

+3042
-1498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3042
-1498
lines changed

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.divudi</groupId>
5-
<artifactId>rh</artifactId>
5+
<artifactId>mp</artifactId>
66
<version>3.0.0</version>
77
<packaging>war</packaging>
8-
<name>rh</name>
8+
<name>mp</name>
99

1010
<properties>
1111
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>

‎src/main/java/com/divudi/bean/common/BillBeanController.java

+29-10
Original file line numberDiff line numberDiff line change
@@ -2478,10 +2478,10 @@ public BillFee createBillFee(BillItem billItem, Fee i, PatientEncounter patientE
24782478
BillFee f;
24792479
f = new BillFee();
24802480
f.setFee(i);
2481-
if(patientEncounter.isForiegner()){
2481+
if (patientEncounter.isForiegner()) {
24822482
f.setFeeValue(i.getFfee());
24832483
f.setFeeGrossValue(i.getFfee());
2484-
}else{
2484+
} else {
24852485
f.setFeeValue(i.getFee());
24862486
f.setFeeGrossValue(i.getFee());
24872487
}
@@ -3180,7 +3180,7 @@ public List<Bill> billsForTheDayNotPaid(BillType type, Department department) {
31803180
}
31813181
return lstBills;
31823182
}
3183-
3183+
31843184
public List<Bill> billsForTheDayNotPaid(BillType type, Department department, Date fromDate, Date toDate) {
31853185
List<Bill> lstBills;
31863186
String sql;
@@ -3195,13 +3195,12 @@ public List<Bill> billsForTheDayNotPaid(BillType type, Department department, Da
31953195
+ " and b.retired=false "
31963196
+ " and b.netTotal!=0 ";
31973197

3198-
3199-
if(fromDate != null && toDate !=null){
3198+
if (fromDate != null && toDate != null) {
32003199
sql += " and b.createdAt between :fromDate and :toDate ";
32013200
temMap.put("fromDate", fromDate);
32023201
temMap.put("toDate", toDate);
32033202
}
3204-
3203+
32053204
sql += " order by b.id desc";
32063205

32073206
temMap.put("billType", type);
@@ -3935,10 +3934,11 @@ public List<BillFee> saveBillFee(BillEntry e, Bill b, WebUser wu) {
39353934
List<BillFee> list = new ArrayList<>();
39363935
double ccfee = 0.0;
39373936
double woccfee = 0.0;
3938-
double staffFee;
3939-
double collectingCentreFee;
3940-
double hospitalFee;
3941-
double otherFee;
3937+
double staffFee = 0.0;
3938+
double collectingCentreFee = 0.0;
3939+
double hospitalFee = 0.0;
3940+
double reagentFee = 0.0;
3941+
double otherFee = 0.0;
39423942
for (BillFee bf : e.getLstBillFees()) {
39433943
bf.setCreatedAt(Calendar.getInstance().getTime());
39443944
bf.setCreater(wu);
@@ -3958,10 +3958,29 @@ public List<BillFee> saveBillFee(BillEntry e, Bill b, WebUser wu) {
39583958
}
39593959
list.add(bf);
39603960

3961+
if (bf.getFee().getFeeType() == FeeType.CollectingCentre) {
3962+
collectingCentreFee += bf.getFeeValue();
3963+
} else if (bf.getFee().getFeeType() == FeeType.Staff) {
3964+
staffFee += bf.getFeeValue();
3965+
} else {
3966+
hospitalFee += bf.getFeeValue();
3967+
}
3968+
3969+
if (bf.getFee().getFeeType() == FeeType.Chemical) {
3970+
reagentFee += bf.getFeeValue();
3971+
} else if (bf.getFee().getFeeType() == FeeType.Additional) {
3972+
otherFee += bf.getFeeValue();
3973+
}
39613974
}
39623975
e.getBillItem().setTransCCFee(ccfee);
39633976
e.getBillItem().setTransWithOutCCFee(woccfee);
39643977

3978+
e.getBillItem().setHospitalFee(hospitalFee);
3979+
e.getBillItem().setCollectingCentreFee(collectingCentreFee);
3980+
e.getBillItem().setStaffFee(staffFee);
3981+
e.getBillItem().setReagentFee(reagentFee);
3982+
e.getBillItem().setOtherFee(otherFee);
3983+
39653984
return list;
39663985
}
39673986

‎src/main/java/com/divudi/bean/common/BillPackageController.java

+90-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import com.divudi.bean.opd.OpdBillController;
5353
import com.divudi.data.BillTypeAtomic;
5454
import com.divudi.data.BillValidation;
55+
import com.divudi.data.FeeType;
5556
import static com.divudi.data.PaymentMethod.Card;
5657
import static com.divudi.data.PaymentMethod.Cash;
5758
import static com.divudi.data.PaymentMethod.Cheque;
@@ -575,8 +576,94 @@ public String cancelPackageBill() {
575576

576577
bill.setCancelled(true);
577578
bill.setCancelledBill(cancellationBill);
578-
getBillFacade().edit(bill);
579+
if (bill.getId() == null) {
580+
getBillFacade().create(bill);
581+
} else {
582+
getBillFacade().edit(bill);
583+
}
584+
585+
List<BillItem> originalBillItem = getBillBean().fillBillItems(bill);
586+
587+
for (BillItem bi : originalBillItem) {
588+
BillItem cancelBillItem = new BillItem();
589+
cancelBillItem.copy(bi);
590+
cancelBillItem.setReferanceBillItem(bi);
591+
cancelBillItem.setBill(cancellationBill);
592+
cancelBillItem.setCreatedAt(new Date());
593+
cancelBillItem.setCreater(getSessionController().getLoggedUser());
594+
//Create Cancel BillItem
595+
if (cancelBillItem.getId() == null) {
596+
billItemFacade.create(cancelBillItem);
597+
} else {
598+
billItemFacade.edit(cancelBillItem);
599+
}
600+
601+
List<BillFee> originalBillItemFees = getBillBean().fetchBillFees(bi);
602+
603+
double hospitalFee = 0.0;
604+
double ccFee = 0.0;
605+
double staffFee = 0.0;
606+
double reagentFee = 0.0;
607+
double otherFee = 0.0;
608+
609+
for (BillFee fee : originalBillItemFees) {
610+
BillFee cancelBillItemFee = new BillFee();
611+
cancelBillItemFee.copy(fee);
612+
cancelBillItemFee.setReferenceBillFee(fee);
613+
cancelBillItemFee.setBill(cancellationBill);
614+
cancelBillItemFee.setBillItem(cancelBillItem);
615+
616+
//Create Cancel BillItemFee
617+
if (cancelBillItemFee.getId() == null) {
618+
billFeeFacade.create(cancelBillItemFee);
619+
} else {
620+
billFeeFacade.edit(cancelBillItemFee);
621+
}
622+
623+
if (cancelBillItemFee.getFee().getFeeType() == FeeType.CollectingCentre) {
624+
ccFee += cancelBillItemFee.getFeeValue();
625+
} else if (cancelBillItemFee.getFee().getFeeType() == FeeType.Staff) {
626+
staffFee += cancelBillItemFee.getFeeValue();
627+
} else {
628+
hospitalFee += cancelBillItemFee.getFeeValue();
629+
}
630+
631+
if (cancelBillItemFee.getFee().getFeeType() == FeeType.Chemical) {
632+
reagentFee += cancelBillItemFee.getFeeValue();
633+
} else if (cancelBillItemFee.getFee().getFeeType() == FeeType.Additional) {
634+
otherFee += cancelBillItemFee.getFeeValue();
635+
}
579636

637+
//update Original BillItemFee
638+
fee.setReferenceBillFee(cancelBillItemFee);
639+
if (cancelBillItemFee.getId() == null) {
640+
billFeeFacade.create(fee);
641+
} else {
642+
billFeeFacade.edit(fee);
643+
}
644+
}
645+
646+
cancelBillItem.setHospitalFee(hospitalFee);
647+
cancelBillItem.setStaffFee(staffFee);
648+
cancelBillItem.setCollectingCentreFee(ccFee);
649+
cancelBillItem.setReagentFee(reagentFee);
650+
cancelBillItem.setOtherFee(otherFee);
651+
652+
if (cancelBillItem.getId() == null) {
653+
billItemFacade.create(cancelBillItem);
654+
} else {
655+
billItemFacade.edit(cancelBillItem);
656+
}
657+
658+
//update Original BillItem
659+
bi.setReferanceBillItem(cancelBillItem);
660+
if (bi.getId() == null) {
661+
billItemFacade.create(bi);
662+
} else {
663+
billItemFacade.edit(bi);
664+
}
665+
}
666+
580667
if (cancellationBill.getPaymentMethod() == PaymentMethod.PatientDeposit) {
581668
PatientDeposit pd = patientDepositController.getDepositOfThePatient(cancellationBill.getPatient(), sessionController.getDepartment());
582669
patientDepositController.updateBalance(cancellationBill, pd);
@@ -588,6 +675,7 @@ public String cancelPackageBill() {
588675
getBillFacade().edit(cancellationBill);
589676
}
590677
}
678+
591679
payments = paymentService.createPayment(cancellationBill, getPaymentMethodData());
592680
printPreview = true;
593681
batchBillCancellationStarted = false;
@@ -1009,7 +1097,7 @@ private Bill saveBill(Department bt, BilledBill temp) {
10091097
temp.setCreater(getSessionController().getLoggedUser());
10101098

10111099
String billNumber = billNumberBean.departmentBillNumberGeneratorYearly(bt, BillTypeAtomic.PACKAGE_OPD_BILL_WITH_PAYMENT);
1012-
1100+
10131101
temp.setDeptId(billNumber);
10141102
temp.setInsId(billNumber);
10151103
temp.setComments(comment);

‎src/main/java/com/divudi/bean/common/BillReturnController.java

+4
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,8 @@ public String settleOpdReturnBill() {
315315
double returningNetTotal = 0.0;
316316
double returningHospitalTotal = 0.0;
317317
double returningStaffTotal = 0.0;
318+
double returningReagentTotal = 0.0;
319+
double returningOtherTotal = 0.0;
318320
double returningDiscount = 0.0;
319321

320322
newlyReturnedBillItems = new ArrayList<>();
@@ -327,6 +329,8 @@ public String settleOpdReturnBill() {
327329
returningNetTotal += selectedBillItemToReturn.getNetValue();
328330
returningHospitalTotal += selectedBillItemToReturn.getHospitalFee();
329331
returningStaffTotal += selectedBillItemToReturn.getStaffFee();
332+
returningReagentTotal += selectedBillItemToReturn.getReagentFee();
333+
returningOtherTotal += selectedBillItemToReturn.getOtherFee();
330334
returningDiscount += selectedBillItemToReturn.getDiscount();
331335

332336
BillItem newlyCreatedReturningItem = new BillItem();

‎src/main/java/com/divudi/bean/common/ControllerWithMultiplePayments.java

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/*
2-
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
3-
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
4-
*/
51
package com.divudi.bean.common;
62

73
import com.divudi.data.dataStructure.PaymentMethodData;

‎src/main/java/com/divudi/bean/common/EnumController.java

+1
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ public PaymentMethod[] getPaymentMethodsForIouSettle() {
819819
return p;
820820
}
821821

822+
@Deprecated // Use getPaymentMethodsForPharmacyBilling
822823
public PaymentMethod[] PaymentMethodsForPharmacyRetailSale() {
823824
PaymentMethod[] p = {
824825
PaymentMethod.Cash,

0 commit comments

Comments
 (0)