提交代码

src/xt_pages/outpatientCharges/invoiceTemplate/printfifteen.vue

@@ -30,12 +30,12 @@
             <div style="position: absolute;top:160px;left:80px">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
             <div style="position: absolute;top:160px;left:220px">材料费 {{ list.materialCostTotal }}</div>
-           
-            <div style="position: absolute;top:200px;left:80px">医疗费总金额: </div>
-            <div style="position: absolute;top:200px;left:250px">个人现金支付: </div>
-            <div style="position: absolute;top:220px;left:80px">全自费金额: </div>
-            <div style="position: absolute;top:220px;left:250px">基金支付总额: </div>
-            <div style="position: absolute;top:240px;left:80px">个人账户支付: </div>
+
+            <div style="position: absolute;top:200px;left:80px">医疗费总金额: {{list.order.medfee_sumamt?list.order.medfee_sumamt:""}}</div>
+            <div style="position: absolute;top:200px;left:250px">个人现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:""}}</div>
+            <div style="position: absolute;top:220px;left:80px">全自费金额: {{list.order.fulamt_ownpay_amt?list.order.fulamt_ownpay_amt:""}}</div>
+            <div style="position: absolute;top:220px;left:250px">基金支付总额: {{list.order.fund_pay_sumamt?list.order.fund_pay_sumamt:""}}</div>
+            <div style="position: absolute;top:240px;left:80px">个人账户支付: {{list.order.acct_pay?list.order.acct_pay:""}}</div>
       <!-- <div style="position: absolute;top:300px;left:80px">医疗费总金额 {{ list.order.medfee_sumamt }}</div>
         <div style="position: absolute;top:300px;left:300px">个人自费 {{ list.psn_cash_money }}</div> -->
         <div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -4301,7 +4301,7 @@ export default {
                     if (this.org_id != 10206) {
                       obj.med_type = 14
                     }else{
-                      obj.med_type = 1
+                      obj.med_type = "1"
                     }
 
                     this.prescriptions.push(obj)
@@ -4947,6 +4947,12 @@ export default {
                         if (obj.med_type == 0 || obj.med_type == '') {
                           obj.med_type = 14
 
+                        }
+                      }else{
+                        obj.med_type = parseInt(prescription.med_type)
+                        if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = "1"
+
                         }
                       }
                       this.prescriptions.push(obj)