From f0b1763fcebae0f32b84ad75ffe1afa57bce7f58 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 8 May 2024 18:01:37 +0800
Subject: [PATCH] dj

---
 .../patientRegister/PatientRegisterEdit.vue          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 9811fde..e8f3dd7 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1483,12 +1483,14 @@ export default {
 
               // 新增保存时，提示是否打条码
               if (!body.id) {
-                this.$confirm("是否打印 检验 与 Pacs 条码?", "提示", {
+                this.$confirm("是否打印 指引单、检验条码及 Pacs 条码?", "提示", {
                   confirmButtonText: "是",
                   cancelButtonText: "否",
                   type: "warning",
                 })
                   .then(() => {
+                    this.guidePrint('0001', false)
+
                     this.labelPrint(false)
                   })                  
                   .catch((err) => {
@@ -1930,10 +1932,10 @@ export default {
       let chargeMoney = Number(0)
       //支付方式,比如是0自费、2免费、1单位支付
       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if (e.payTypeFlag == '0' && e.isCharge == 'N') chargeMoney += Number(e.total)
+        if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
       });
       if (chargeMoney == 0) {
-        this.$message.warning({ showClose: true, message: '没有可收费的记录！' })
+        this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
         return
       }
 
@@ -1964,10 +1966,10 @@ export default {
       let chargeMoney = Number(0)
       //支付方式,比如是0自费、2免费、1单位支付
       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if (e.payTypeFlag == '0' && e.isCharge == 'N') chargeMoney += Number(e.total)
+        if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
       });
       if (chargeMoney == 0) {
-        this.$message.warning({ showClose: true, message: '没有可收费的记录！' })
+        this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
         return
       }