|
@@ -15,6 +15,7 @@ import cn.hnthyy.thmz.service.his.mz.*;
|
|
|
import cn.hnthyy.thmz.service.his.zd.ZdChequeTypeService;
|
|
|
import cn.hnthyy.thmz.vo.MzReceiptSerialVo;
|
|
|
import cn.hnthyy.thmz.vo.UseReceioVo;
|
|
|
+import cn.hutool.core.convert.Convert;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.math.BigDecimal;
|
|
@@ -153,9 +155,11 @@ public class MzReceiptSerialController {
|
|
|
BigDecimal totalPay = BigDecimal.ZERO;
|
|
|
//所有付款方式总金额
|
|
|
BigDecimal fullTotalPay = BigDecimal.ZERO;
|
|
|
+ List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeType();
|
|
|
+ Map<String, Integer> printFlagMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getPrintFlag));
|
|
|
if (mzDepositFiles != null && mzDepositFiles.size() > 0) {
|
|
|
for (MzDepositFile mzDepositFile : mzDepositFiles) {
|
|
|
- if (!Constants.BYJZ.equals(mzDepositFile.getChequeType()) && !Constants.YBJZ.equals(mzDepositFile.getChequeType()) && !Constants.DJZ.equals(mzDepositFile.getChequeType())) {
|
|
|
+ if (Convert.toInt(printFlagMap.get(mzDepositFile.getChequeType()),0) == 1) {
|
|
|
totalPay = totalPay.add(mzDepositFile.getAmount());
|
|
|
}
|
|
|
fullTotalPay=fullTotalPay.add(mzDepositFile.getAmount());
|