no message

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzReceiptSerialServiceImpl.java

@@ -434,25 +434,39 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
             mzReceiptSerialVo.setTotalChargeStr(NumberToCN.number2CNMontrayUnit(mzReceiptSerial.getTotalCharge()));
         }
         mzReceiptSerialVo.setFeeList(feeList);
-        List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.queryFyJl(mzReceiptSerial.getPatientId(), mzReceiptSerial.getTimes());
-        if (mzChargeDetailList != null && mzChargeDetailList.size() > 0) {
-            List<String> qyxxs = new ArrayList<>();
-            StringBuffer sbf = new StringBuffer();
-            for (MzChargeDetail mzChargeDetail : mzChargeDetailList) {
-                if (mzChargeDetail != null) {
-                    if (StringUtils.isNotBlank(mzChargeDetail.getGroupNo()) && StringUtils.isNotBlank(mzChargeDetail.getWindowsNoYf())) {
-                        MzDrugWin mzDrugWin = mzDrugWinService.queryMzDrugWinByGroupNoAndWinNo(mzChargeDetail.getGroupNo(), mzChargeDetail.getWindowsNoYf());
-                        if (mzDrugWin != null) {
-                            sbf.append(mzDrugWin.getWinName());
-                            sbf.append(",");
-                            sbf.append(mzChargeDetail.getBackSerial());
-                            qyxxs.add(sbf.toString());
-                            sbf.setLength(0);
-                        }
-                    }
+
+//        List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.queryFyJl(mzReceiptSerial.getPatientId(), mzReceiptSerial.getTimes());
+//        if (mzChargeDetailList != null && mzChargeDetailList.size() > 0) {
+//            List<String> qyxxs = new ArrayList<>();
+//            StringBuffer sbf = new StringBuffer();
+//            for (MzChargeDetail mzChargeDetail : mzChargeDetailList) {
+//                if (mzChargeDetail != null) {
+//                    if (StringUtils.isNotBlank(mzChargeDetail.getGroupNo()) && StringUtils.isNotBlank(mzChargeDetail.getWindowsNoYf())) {
+//                        MzDrugWin mzDrugWin = mzDrugWinService.queryMzDrugWinByGroupNoAndWinNo(mzChargeDetail.getGroupNo(), mzChargeDetail.getWindowsNoYf());
+//                        if (mzDrugWin != null) {
+//                            sbf.append(mzDrugWin.getWinName());
+//                            sbf.append(",");
+//                            sbf.append(mzChargeDetail.getBackSerial());
+//                            qyxxs.add(sbf.toString());
+//                            sbf.setLength(0);
+//                        }
+//                    }
+//                }
+//            }
+//            mzReceiptSerialVo.setQyxxs(qyxxs);
+//        }
+        List<MzDepositFile> mzDepositFileList=mzDepositFileMapper.selectMzDepositFileByTimes(mzReceiptSerial.getPatientId(),mzReceiptSerial.getTimes(),mzReceiptSerial.getReceiptNo(),"mz_deposit_file");
+        if(mzDepositFileList!=null && mzDepositFileList.size()>0){
+            BigDecimal totalAmount = mzChargeDetailMapper.selectSumAmount(mzReceiptSerial.getPatientId(), mzReceiptSerial.getTimes(), mzReceiptSerial.getReceiptNo());
+            String payInfo="总额:"+totalAmount;
+            for(MzDepositFile mzDepositFile:mzDepositFileList){
+                if(Constants.YBJZ.equals(mzDepositFile.getChequeType())){
+                    payInfo=payInfo+" 统筹:"+mzDepositFile.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP);
+                }else if(Constants.SSHIYBGZ.equals(mzDepositFile.getChequeType()) || Constants.SHENYGZ.equals(mzDepositFile.getChequeType())){
+                    payInfo=payInfo+" 个账:"+mzDepositFile.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP);
                 }
             }
-            mzReceiptSerialVo.setQyxxs(qyxxs);
+            mzReceiptSerialVo.setPayInfo(payInfo);
         }
         setChargeDate(mzReceiptSerial, mzReceiptSerialVo);
         if (StringUtils.isNotBlank(mzReceiptSerial.getOperatorId())) {

src/main/java/cn/hnthyy/thmz/vo/MzReceiptSerialVo.java

@@ -26,4 +26,6 @@ public class MzReceiptSerialVo {
     private List<String> qyxxs;
     //是否是门诊统筹
     private Integer countYbZf;
+    //支付方式与金额
+    private String payInfo;
 }

src/main/resources/static/js/mz/toll_administration.js

@@ -1684,18 +1684,20 @@ function printCommon(url, patientId, times, chargeFeeFlag) {
                     // LODOP.ADD_PRINT_TEXT("37mm","25mm","25mm","3mm","治疗费  22.00");
                     // LODOP.ADD_PRINT_TEXT("37mm","50mm","25mm","3mm","材料费  14.20");
                     // LODOP.ADD_PRINT_TEXT("42mm","25mm","25mm","3mm","西药费 161.20");
-                    var qyxxs = res.data[i].qyxxs;
-                    if (qyxxs != null && qyxxs.length > 0) {
-                        var top = 54;
-                        for (var j = 0; j < qyxxs.length; j++) {
-                            var row = j / 3;
-                            var tempTop = top + row * 10;
-                            var qyxx = qyxxs[j];
-                            var arr = qyxx.split(",");
-                            LODOP.ADD_PRINT_TEXT(tempTop + "mm", "6mm", "50mm", "3mm", "取药窗口：" + arr[0]);
-                            LODOP.ADD_PRINT_TEXT(tempTop + "mm", "61mm", "50mm", "3mm", "取药号码：" + arr[1]);
-                        }
-                    }
+                    // var qyxxs = res.data[i].qyxxs;
+                    // if (qyxxs != null && qyxxs.length > 0) {
+                    //     var top = 54;
+                    //     for (var j = 0; j < qyxxs.length; j++) {
+                    //         var row = j / 3;
+                    //         var tempTop = top + row * 10;
+                    //         var qyxx = qyxxs[j];
+                    //         var arr = qyxx.split(",");
+                    //         LODOP.ADD_PRINT_TEXT(tempTop + "mm", "6mm", "50mm", "3mm", "取药窗口：" + arr[0]);
+                    //         LODOP.ADD_PRINT_TEXT(tempTop + "mm", "61mm", "50mm", "3mm", "取药号码：" + arr[1]);
+                    //     }
+                    // }
+                    var payInfo = res.data[i].payInfo;
+                    LODOP.ADD_PRINT_TEXT("54mm", "6mm", "100mm", "3mm", payInfo);
                     // LODOP.ADD_PRINT_TEXT("54mm","25mm","50mm","3mm","取药窗口：西药房4号窗口");
                     // LODOP.ADD_PRINT_TEXT("54mm","80mm","35mm","3mm","取药号码：408392");
                     var totalCharge=temp.totalCharge + " 元 ";