|
|
@@ -5681,7 +5681,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
List<MzDepositFile> mzDepositFiles = mzDepositFileMapper.selectMzDepositFileByTimes(patientId, times, receiptNo, "mz_deposit_file");
|
|
|
//本院记账重收的时候。新的收费方式与老的部分收费方式的receiptNo 不一致,所以加这个逻辑
|
|
|
BigDecimal tempAmount = mzDepositFileMapper.selectSumAmount(patientId, times, receiptNo);
|
|
|
- if (totalAmount.compareTo(tempAmount) > 0) {
|
|
|
+ if (totalAmount.compareTo(Convert.toBigDecimal(tempAmount,BigDecimal.ZERO)) > 0) {
|
|
|
mzDepositFiles = mzDepositFileMapper.selectMzDepositFileByTimesWithOutByjz(patientId, times);
|
|
|
}
|
|
|
MzDepositFile tempMzDepositFile = null;
|
|
|
@@ -5768,7 +5768,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
List<MzReceiptSerial> mzReceiptSerials = mzReceiptSerialMapper.selectReceiptDetails(patientId, times, receiptNo, "mz_receipt_serial");
|
|
|
//本院记账重收的时候。新的收费方式与老的部分收费方式的receiptNo 不一致,所以加这个逻辑
|
|
|
BigDecimal tempAmount = mzDepositFileMapper.selectSumAmount(patientId, times, receiptNo);
|
|
|
- if (totalAmount.compareTo(tempAmount) > 0) {
|
|
|
+ if (totalAmount.compareTo(Convert.toBigDecimal(tempAmount,BigDecimal.ZERO)) > 0) {
|
|
|
mzReceiptSerials = mzReceiptSerialMapper.selectReceiptDetailsWithOutByjz(patientId, times);
|
|
|
}
|
|
|
MzReceiptSerial tempMzReceiptSerial = null;
|