门诊处方支持查看订单支付详情。

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -554,10 +554,16 @@ public class MedicalViewApiController {
                 if(haicipat.getYbRequest()==null || !YesNoEnum.YES.code.equals(haicipat.getYbRequest())){
                     PayInfo payInfo = tsmzService.uploadFees(whiteList.getOpId(), mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), mzChargeDetail.getReceiptNo());
                     if (payInfo != null && payInfo.getCode() == 0) {
+                        if(payInfo.getAcctPay()==null){
+                            payInfo.setAcctPay(BigDecimal.ZERO);
+                        }
+                        if(payInfo.getFundPay()==null){
+                            payInfo.setFundPay(BigDecimal.ZERO);
+                        }
                         //个人医保账户支付
-                        map.put("acctPay", payInfo.getAcctPay());
+                        map.put("acctPay", payInfo.getAcctPay().multiply(BigDecimal.valueOf(100)));
                         //医保统筹报销
-                        map.put("fundPay", payInfo.getFundPay());
+                        map.put("fundPay", payInfo.getFundPay().multiply(BigDecimal.valueOf(100)));
                         map.put("selfAmt", mzChargeDetail.getAmount().subtract(payInfo.getAcctPay()).subtract(payInfo.getFundPay()).multiply(BigDecimal.valueOf(100)));
                     }
                 }

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -14,10 +14,7 @@ import cn.hnthyy.thmz.entity.his.zd.ZdChargeItem;
 import cn.hnthyy.thmz.entity.his.zd.ZdUnitCode;
 import cn.hnthyy.thmz.entity.his.zy.ZyZdAuditItem;
 import cn.hnthyy.thmz.entity.thmz.*;
-import cn.hnthyy.thmz.enums.ConfirmFlagEnum;
-import cn.hnthyy.thmz.enums.GenderEnum;
-import cn.hnthyy.thmz.enums.PayMarkEnum;
-import cn.hnthyy.thmz.enums.YesNoEnum;
+import cn.hnthyy.thmz.enums.*;
 import cn.hnthyy.thmz.pageDto.MzChargeDetailPageDto;
 import cn.hnthyy.thmz.service.his.mz.*;
 import cn.hnthyy.thmz.service.his.yp.YpZdDictService;
@@ -81,6 +78,8 @@ public class MzChargeDetailController {
     private YpZdDictService ypZdDictService;
     @Autowired
     private YpZdDrugKindService ypZdDrugKindService;
+    @Autowired
+    private MzDepositFileService mzDepositFileService;
 
     /**
      * 查询费用列表
@@ -1783,87 +1782,181 @@ public class MzChargeDetailController {
      */
     @UserLoginToken
     @RequestMapping(value = "/getChargeDetailForGuideCard", method = {RequestMethod.GET})
-    public Map<String, Object> getChargeDetailForGuideCard(@RequestParam("patientId") String patientId, @RequestParam("times") Integer times) {
+    public Map<String, Object> getChargeDetailForGuideCard(@RequestParam("patientId") String patientId, @RequestParam("times") Integer times, HttpServletRequest httpServletRequest) {
+        Map<String, Object> results = null;
+        try {
+            results = getChargeDetailFee(patientId, times, 1, null, httpServletRequest);
+            BigDecimal selfAmount = (BigDecimal) results.get("selfAmount");
+            String payQrcode = haiCiAdapterService.genMzPayQrcode(selfAmount.multiply(BigDecimal.valueOf(100)).intValue(), patientId, patientId + "_" + times + "_1");
+            if (payQrcode != null) {
+                results.put("payQrcode", payQrcode);
+            }
+            return results;
+        } catch (Exception e) {
+            if (results == null) {
+                results = new HashMap<>();
+            }
+            e.printStackTrace();
+            results.put("code", -1);
+            results.put("message", "门诊缴费指引单查询失败，请联系管理员");
+            log.error("系统异常，错误信息{}", e);
+            return results;
+        }
+    }
+
+
+    /**
+     * 查询门诊订单金额与支付明细
+     *
+     * @param patientId          门诊病人id
+     * @param times              就诊次数
+     * @param receiptNo          缴费次数
+     * @param clnicId            订单id
+     * @param httpServletRequest
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getChargeDetailFee", method = {RequestMethod.GET})
+    public Map<String, Object> getChargeDetailFee(@RequestParam("patientId") String patientId, @RequestParam("times") Integer times, @RequestParam("receiptNo") Integer receiptNo, @RequestParam("clnicId") Long clnicId, HttpServletRequest httpServletRequest) {
         Map<String, Object> results = new HashMap<>();
-        if (times == null) {
+        if (clnicId == null && times == null) {
             results.put("code", -1);
             results.put("message", "就诊次数为空");
             return results;
         }
-        if (StringUtils.isBlank(patientId)) {
+        if (clnicId == null && StringUtils.isBlank(patientId)) {
             results.put("code", -1);
             results.put("message", "患者门诊ID不能为空");
             return results;
         }
         try {
-            MzChargeDetail mzChargeDetail = new MzChargeDetail(patientId, times);
-            mzChargeDetail.setBillItemCode("100");
-            List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.getTempMzChargeDetailListForUnPaid(mzChargeDetail);
-            if (mzChargeDetailList == null || mzChargeDetailList.size() == 0) {
-                results.put("code", -2);
-                results.put("message", "未查询到门诊缴费指引单记录");
-                return results;
-            }
-            mzChargeDetailList = mzChargeDetailService.getMzChargeDetails(mzChargeDetailList);
-            List<Map<String, Object>> returnList = new ArrayList<>();
-            Map<String, ZdUnitCode> unitCodeMap = new HashMap<>();
-            Map<String, Map<String, Object>> tempMap = new HashMap<>();
-            List<BillItem> mzBillItems = mzBillItemService.queryMzBillItem();
-            Map<String, String> mzBillItemMap = null;
-            if (mzBillItems != null) {
-                mzBillItemMap = mzBillItems.stream().collect(Collectors.toMap(BillItem::getCode, BillItem::getName));
+            String payMark = PayMarkEnum.NO_CHARGE.code;
+            if (clnicId != null) {
+                Clinic clinic = clinicService.queryById(clnicId);
+                if (clinic == null) {
+                    results.put("code", -1);
+                    results.put("message", "患者就诊记录不存在");
+                    return results;
+                }
+                patientId=clinic.getPatientId();
+                times=clinic.getTimes();
+                receiptNo=clinic.getReceiptNo();
+                if (ClinicStatusEnum.HAD_CLINIC.code.equals(clinic.getClinicStatus())) {
+                    payMark = PayMarkEnum.NO_CHARGE.code;
+                } else if (ClinicStatusEnum.CHARGED.code.equals(clinic.getClinicStatus())) {
+                    payMark = PayMarkEnum.CHARGED.code;
+                } else {
+                    results.put("code", -1);
+                    results.put("message", "次状态的处方无需查看缴费明细");
+                    return results;
+                }
             }
-            BigDecimal totalAmount = BigDecimal.ZERO;
-            for (MzChargeDetail mz : mzChargeDetailList) {
-                if (Arrays.asList(Constants.TC, Constants.SSWRF).contains(mz.getBillItemCode())) {
-                    continue;
+            if (PayMarkEnum.NO_CHARGE.code.equals(payMark)) {
+                MzChargeDetail mzChargeDetail = new MzChargeDetail(patientId, times);
+                mzChargeDetail.setBillItemCode("100");
+                List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.getTempMzChargeDetailListForUnPaid(mzChargeDetail);
+                if (mzChargeDetailList == null || mzChargeDetailList.size() == 0) {
+                    results.put("code", -2);
+                    results.put("message", "未查询到门诊处方记录");
+                    return results;
                 }
-                Map<String, Object> map = tempMap.get(mz.getBillItemCode());
-                if (map == null) {
-                    map = new HashMap<>();
-                    tempMap.put(mz.getBillItemCode(), map);
-                    returnList.add(map);
-                    if (mzBillItemMap != null) {
-                        map.put("itemType", mzBillItemMap.get(mz.getBillItemCode()));
+                mzChargeDetailList = mzChargeDetailService.getMzChargeDetails(mzChargeDetailList);
+                List<Map<String, Object>> returnList = new ArrayList<>();
+                Map<String, ZdUnitCode> unitCodeMap = new HashMap<>();
+                Map<String, Map<String, Object>> tempMap = new HashMap<>();
+                List<BillItem> mzBillItems = mzBillItemService.queryMzBillItem();
+                Map<String, String> mzBillItemMap = null;
+                if (mzBillItems != null) {
+                    mzBillItemMap = mzBillItems.stream().collect(Collectors.toMap(BillItem::getCode, BillItem::getName));
+                }
+                BigDecimal totalAmount = BigDecimal.ZERO;
+                for (MzChargeDetail mz : mzChargeDetailList) {
+                    if (Arrays.asList(Constants.TC, Constants.SSWRF).contains(mz.getBillItemCode())) {
+                        continue;
+                    }
+                    Map<String, Object> map = tempMap.get(mz.getBillItemCode());
+                    if (map == null) {
+                        map = new HashMap<>();
+                        tempMap.put(mz.getBillItemCode(), map);
+                        returnList.add(map);
+                        if (mzBillItemMap != null) {
+                            map.put("itemType", mzBillItemMap.get(mz.getBillItemCode()));
+                        }
+                        ZdUnitCode unitCode = unitCodeMap.get(mz.getExecDept());
+                        if (unitCode == null && StringUtils.isNotBlank(mz.getExecDept())) {
+                            unitCode = zdUnitCodeService.queryByCode(mz.getExecDept());
+                            unitCodeMap.put(mz.getExecDept(), unitCode);
+                        }
+                        map.put("execDeptName", unitCode == null ? "" : unitCode.getName());
+                        map.put("execDeptAddress", (unitCode == null || unitCode.getOfficePos() == null) ? "" : unitCode.getOfficePos());
                     }
-                    ZdUnitCode unitCode = unitCodeMap.get(mz.getExecDept());
-                    if (unitCode == null && StringUtils.isNotBlank(mz.getExecDept())) {
-                        unitCode = zdUnitCodeService.queryByCode(mz.getExecDept());
-                        unitCodeMap.put(mz.getExecDept(), unitCode);
+                    BigDecimal unitPrice = mz.getUnitPrice().setScale(2, BigDecimal.ROUND_HALF_UP);
+                    if (BigDecimal.ZERO.equals(unitPrice)) {
+                        unitPrice = BigDecimal.valueOf(0.01D);
                     }
-                    map.put("execDeptName", unitCode == null ? "" : unitCode.getName());
-                    map.put("execDeptAddress", (unitCode == null || unitCode.getOfficePos() == null) ? "" : unitCode.getOfficePos());
+                    //unitPrice = unitPrice.multiply(BigDecimal.valueOf(100));
+                    BigDecimal quantity = mz.getQuantity() == null ? BigDecimal.ONE : BigDecimal.valueOf(mz.getQuantity());
+                    BigDecimal drugWin = mz.getDrugWin() == null ? BigDecimal.ONE : BigDecimal.valueOf(mz.getDrugWin());
+                    BigDecimal amount = (BigDecimal) map.get("itemTotalFee");
+                    if (amount == null) {
+                        amount = BigDecimal.ZERO;
+                    }
+                    BigDecimal tempAmount = unitPrice.multiply(quantity).multiply(drugWin);
+                    totalAmount = totalAmount.add(tempAmount);
+                    map.put("itemTotalFee", amount.add(tempAmount));
                 }
-                BigDecimal unitPrice = mz.getUnitPrice().setScale(2, BigDecimal.ROUND_HALF_UP);
-                if (BigDecimal.ZERO.equals(unitPrice)) {
-                    unitPrice = BigDecimal.valueOf(0.01D);
+                totalAmount = totalAmount.setScale(1, BigDecimal.ROUND_HALF_UP);
+                BigDecimal selfAmount = totalAmount;
+                User tokenUser = TokenUtil.getUser(httpServletRequest);
+                PayInfo payInfo = tsmzService.uploadFees(tokenUser.getUserIdCode(), patientId, times, receiptNo);
+                if (payInfo != null && payInfo.getCode() == 0) {
+                    //个人医保账户支付
+                    results.put("acctPay", payInfo.getAcctPay());
+                    //医保统筹报销
+                    results.put("fundPay", payInfo.getFundPay());
+                    selfAmount = totalAmount.subtract(payInfo.getAcctPay()).subtract(payInfo.getFundPay());
                 }
-                //unitPrice = unitPrice.multiply(BigDecimal.valueOf(100));
-                BigDecimal quantity = mz.getQuantity() == null ? BigDecimal.ONE : BigDecimal.valueOf(mz.getQuantity());
-                BigDecimal drugWin = mz.getDrugWin() == null ? BigDecimal.ONE : BigDecimal.valueOf(mz.getDrugWin());
-                BigDecimal amount = (BigDecimal) map.get("itemTotalFee");
-                if (amount == null) {
-                    amount = BigDecimal.ZERO;
+                results.put("code", 0);
+                results.put("message", "查询门诊订单金额与支付明细成功");
+                results.put("totalAmount", totalAmount);
+                results.put("selfAmount", selfAmount);
+                results.put("data", returnList);
+                return results;
+            }
+            MzDepositFile mzDepositFile = new MzDepositFile(patientId, times);
+            mzDepositFile.setReceiptNo(receiptNo);
+            List<MzDepositFile> mzDepositFileList = mzDepositFileService.queryMzDepositFile(mzDepositFile);
+            BigDecimal totalAmount = BigDecimal.ZERO;
+            BigDecimal selfAmount = BigDecimal.ZERO;
+            BigDecimal acctPay = BigDecimal.ZERO;
+            BigDecimal fundPay = BigDecimal.ZERO;
+            if (mzDepositFileList != null && mzDepositFileList.size() > 0) {
+                for (MzDepositFile mf : mzDepositFileList) {
+                    if (mf.getAmount() != null) {
+                        totalAmount = totalAmount.add(mf.getAmount());
+                    }
+                    if (Constants.YBJZ.equals(mf.getChequeType())) {
+                        fundPay = fundPay.add(mf.getAmount());
+                    } else if (Constants.SSHIYBK.equals(mf.getChequeType()) || Constants.SHENYBK.equals(mf.getChequeType())) {
+                        acctPay = acctPay.add(mf.getAmount());
+                    } else {
+                        selfAmount = selfAmount.add(mf.getAmount());
+                    }
                 }
-                BigDecimal tempAmount = unitPrice.multiply(quantity).multiply(drugWin);
-                totalAmount = totalAmount.add(tempAmount);
-                map.put("itemTotalFee", amount.add(tempAmount));
             }
-            totalAmount = totalAmount.setScale(1, BigDecimal.ROUND_HALF_UP);
-            String payQrcode = haiCiAdapterService.genMzPayQrcode(totalAmount.multiply(BigDecimal.valueOf(100)).intValue(), patientId, patientId + "_" + times + "_1");
             results.put("code", 0);
-            results.put("message", "门诊缴费指引单查询成功");
+            results.put("message", "查询门诊订单金额与支付明细成功");
             results.put("totalAmount", totalAmount);
-            results.put("data", returnList);
-            if (payQrcode != null) {
-                results.put("payQrcode", payQrcode);
-            }
+            results.put("selfAmount", selfAmount);
+            results.put("fundPay", fundPay);
+            results.put("acctPay", acctPay);
             return results;
+
         } catch (Exception e) {
             e.printStackTrace();
             results.put("code", -1);
-            results.put("message", "门诊缴费指引单查询失败，请联系管理员");
-            log.error("系统异常，错误信息{}", e);
+            results.put("message", "查询门诊订单金额与支付明细失败，请联系管理员");
+            log.error("查询门诊订单金额与支付明细时系统异常，错误信息{}", e);
             return results;
         }
     }
@@ -2112,11 +2205,11 @@ public class MzChargeDetailController {
                 resultMap.put("message", "职工门诊统筹试算失败,读卡类型为空");
                 return resultMap;
             }
-            if (StringUtils.isBlank(mzPrescriptionVo.getReadCardResult())) {
-                resultMap.put("code", -1);
-                resultMap.put("message", "职工门诊统筹试算失败,读卡返回为空");
-                return resultMap;
-            }
+//            if (StringUtils.isBlank(mzPrescriptionVo.getReadCardResult())) {
+//                resultMap.put("code", -1);
+//                resultMap.put("message", "职工门诊统筹试算失败,读卡返回为空");
+//                return resultMap;
+//            }
             User tokenUser = TokenUtil.getUser(httpServletRequest);
             if (tokenUser == null) {
                 resultMap.put("code", -1);

src/main/java/cn/hnthyy/thmz/controller/mz/PaidForZZController.java

@@ -112,11 +112,6 @@ public class PaidForZZController {
                 resultMap.put("message", "交易订单号不能为空");
                 return resultMap;
             }
-            if (wxPayOrder.getId() == null) {
-                resultMap.put("code", -1);
-                resultMap.put("message", "订单ID不能为空");
-                return resultMap;
-            }
             if (wxPayOrder.getTotalFee() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "退费金额不能为空");

src/main/resources/application-dev.yml

@@ -117,7 +117,7 @@ setUnitPrice: false
 #haiciServiceUrl: "https://sapi.med.gzhc365.com/openapi/health"
 
 #泰和微信开放服务地址测试环境
-haiciServiceUrl: "http://172.16.30.26/wxserver"
+haiciServiceUrl: "http://172.16.30.26:8805/wxserver"
 
 #泰和微信缴费服务地址测试环境
 wxPayOrderServiceUrl: "http://172.16.30.26:8706"

src/main/resources/static/js/charge/paid_from_zz.js

@@ -140,7 +140,7 @@ function initFeeTable() {
                 formatter: function (value, row, index) {
                     var str = '';
                     if (payMarkGroup == 0) {
-                        str += '<button type="button" class="registration-no-color-foot-button" title="退费" onclick="refundFee(\'' + row.patientId + '\',' + row.id + ',' + row.totalFee + ',\'' + row.tradeNo + '\',\'' + row.patientName + '\',\'' + row.body + '\',' + row.orderType + ',);"><i class="fa fa-reply"></i></button>';
+                        str += '<button type="button" class="registration-no-color-foot-button" title="退费" onclick="refundFee(\'' + row.patientId + '\',' + row.totalFee + ',\'' + row.tradeNo + '\',\'' + row.patientName + '\',\'' + row.body + '\',' + row.orderType + ',);"><i class="fa fa-reply"></i></button>';
                     }
                     return str;
                 }
@@ -300,8 +300,7 @@ function getRePortRangeArr() {
 /**
  * 退费操作
  */
-function refundFee(patientId,id, totalFee, tradeNo,name,body,orderType) {
-    $("#refundId").val(id);
+function refundFee(patientId, totalFee, tradeNo,name,body,orderType) {
     $("#patientIdRead").val(patientId);
     $("#nameRead").val(name);
     $("#bodyRead").val(body);
@@ -316,7 +315,6 @@ function refundFee(patientId,id, totalFee, tradeNo,name,body,orderType) {
  * 清空提示区域
  */
 function clearMode() {
-    $("#refundId").val(null);
     $("#tradeNoRead").val(null);
     $("#patientIdRead").val(null);
     $("#patientId").val(null);
@@ -337,7 +335,6 @@ function saveRefundFee() {
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         data: JSON.stringify({
-            id: $("#refundId").val(),
             totalFee: $("#amountRead").val(),
             tradeNo: $("#tradeNoRead").val(),
             orderType: $("#refundOrderType").val()

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

@@ -8465,6 +8465,37 @@ function prescriptionDetailCommon(patientId, times, clnicId, payMark, type) {
             }
         }
     });
+    $("#selfAmountView").html(0.00);
+    $("#fundPayView").html(0.00);
+    $("#acctPayView").html(0.00);
+    $("#totalAmountView").html(0.00);
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getChargeDetailFee?patientId=&times=&receiptNo=&clnicId='+clnicId,
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        async: false,
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                if(res.fundPay!=undefined && res.fundPay!=null){
+                    $("#fundPayView").text("￥" + res.fundPay);
+                }
+                if(res.acctPay!=undefined && res.acctPay!=null){
+                    $("#acctPayView").text("￥" + res.acctPay);
+                }
+                $("#selfAmountView").text("￥" + res.selfAmount);
+                $("#totalAmountView").text("￥" + res.totalAmount);
+            } else {
+                printIndex = -1;
+            }
+        }
+    });
+
 }
 
 
@@ -8898,7 +8929,10 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                     $("#guideCardDetail").html(html);
                                 }
                                 if (res.payQrcode != null && res.payQrcode != "") {
-                                    $("#payQrcodeGuideCard").html(null);
+                                    $("#selfAmountGuideCard").html(0.00);
+                                    $("#fundPayGuideCard").html(0.00);
+                                    $("#acctPayGuideCard").html(0.00);
+                                    $("#payQrcodeGuideCard").html(0.00);
                                     new QRCode(document.getElementById("payQrcodeGuideCard"), res.payQrcode);  // 设置要生成二维码的链接
                                     $("canvas").attr("id", "erw");
                                     var canvas = document.getElementById('erw');
@@ -8906,6 +8940,13 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                     //var strDataURI =canvas.toDataURL("image/png");
                                     $("#payQrcodeGuideCard").html("<img src='" + src + "' style='width:100px;height:100px;'/><div style='width: 100px;margin-top: 10px;text-align: center;'>微信支付</div>");
                                 }
+                                if(res.fundPay!=undefined && res.fundPay!=null){
+                                    $("#fundPayGuideCard").text("￥" + res.fundPay);
+                                }
+                                if(res.acctPay!=undefined && res.acctPay!=null){
+                                    $("#acctPayGuideCard").text("￥" + res.acctPay);
+                                }
+                                $("#selfAmountGuideCard").text("￥" + res.selfAmount);
                                 $("#totalAmountGuideCard").text("￥" + res.totalAmount);
                                 // $("#imgcode").JsBarcode(patientId);
                                 console.log(patientId);

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

@@ -1141,6 +1141,7 @@ function checkFee(flag) {
  * 提示有记账记录
  */
 function tipHaveTally(data, patientId, times, name, receiptNo) {
+    closeConfirmFeeModal();
     if (patientId == null || patientId == "") {
         return;
     }
@@ -1378,13 +1379,7 @@ function saveConfirmFee() {
             if (res.code == 0) {
                 prn1Print(patientId, times, true, res.receiptNo);
                 successMesage(res);
-                $("#confirmFeeModal").modal("hide");
-                $("#patientId").val(null);
-                $("#cardNo").val(null);
-                $("#name").val(null);
-                $("#fundPay").val(0);
-                $("#acctPay").val(0);
-                $("#cardType").val(null);
+                closeConfirmFeeModal();
                 //缴费成功后清空全局参数
                 patientIdFullForNucleicAcid = null;
                 initFeeTable();
@@ -1399,6 +1394,18 @@ function saveConfirmFee() {
     });
 }
 
+/**
+ * 关闭收费确认模态弹框
+ */
+function closeConfirmFeeModal() {
+    $("#confirmFeeModal").modal("hide");
+    $("#patientId").val(null);
+    $("#cardNo").val(null);
+    $("#name").val(null);
+    $("#fundPay").val(0);
+    $("#acctPay").val(0);
+    $("#cardType").val(null);
+}
 
 /**
  * 保存合作项目

src/main/resources/templates/charge/paid_from_zz.html

@@ -123,7 +123,6 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <input id="refundId" type="hidden"/>
                 <input id="refundOrderType" type="hidden"/>
                 <button type="button" class="btn btn-primary" onclick="saveRefundFee()">确定</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal" onclick="clearMode()">取消</button>

src/main/resources/templates/mz/clinic.html

@@ -1656,6 +1656,10 @@
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
                 <div class="x_panel_mine" style="background: #EBEBE4;">
                     <div class="x_title">
+                        <span style="font-weight: 700;color: black;margin-right: 20px;">自付金额：<span id="selfAmountView" style="color: black;"></span>元</span>
+                        <span style="font-weight: 700;color: black;margin-right: 20px;">门诊统筹：<span id="fundPayView" style="color: black;"></span>元</span>
+                        <span style="font-weight: 700;color: black;margin-right: 20px;">个账支付：<span id="acctPayView" style="color: black;"></span>元</span>
+                        <span style="font-weight: 700;color: black;margin-right: 20px;">合计金额：<span id="totalAmountView" style="color: black;"></span>元</span>
                         <span>打印设置 </span>
                         <ul class="nav navbar-right panel_toolbox">
                             <li><a class="collapse-link"><i class="fa fa-chevron-up" id="setupId"></i></a>
@@ -2165,15 +2169,20 @@
             </tbody>
         </table>
         <table class="table table-striped table-bordered" style="font-size: 13px;margin-top: 10px;">
-
             <tbody>
             <tr>
-                <td style="font-weight: 700">合计：<span id="totalAmountGuideCard"></span></td>
-                <td>请缴费后至以上科室取药或检查治疗</td>
+                <td style="font-weight: 700">自付金额：<span id="selfAmountGuideCard"></span><span>元</span></td>
+                <td style="font-weight: 700">门诊统筹：<span id="fundPayGuideCard"></span><span>元</span></td>
+            </tr>
+            <tr>
+                <td style="font-weight: 700">个账支付：<span id="acctPayGuideCard"></span><span>元</span></td>
+                <td style="font-weight: 700">合计金额：<span id="totalAmountGuideCard"></span><span>元</span></td>
+            </tr>
+            <tr>
+                <td colspan="2">如有故障请联系服务中心：0731-88518702</td>
             </tr>
             <tr>
-                <td>如有故障请联系服务中心：88518702</td>
-                <td>检查完成后可关注服务号查询结果</td>
+                <td colspan="2">请缴费后至以上科室取药或检查治疗，检查完成后可关注服务号查询结果。</td>
             </tr>
             </tbody>
         </table>