Browse Source

提交代码

陈少旭 1 year ago
parent
commit
c9bc7a606a

+ 3 - 1
src/xt_pages/outpatientCharges/statementPrint.vue View File

671
             }
671
             }
672
           })
672
           })
673
         } else {
673
         } else {
674
+          console.log("------==========`````")
674
           getPrivateExpensesOrder(params).then((response) => {
675
           getPrivateExpensesOrder(params).then((response) => {
675
             if (response.data.state == 0) {
676
             if (response.data.state == 0) {
676
               // this.$message.error(response.data.msg)
677
               // this.$message.error(response.data.msg)
681
               that.info = response.data.data.info
682
               that.info = response.data.data.info
682
               that.p_admin = response.data.data.printor_admin
683
               that.p_admin = response.data.data.printor_admin
683
               that.charge_admin = response.data.data.charge_admin
684
               that.charge_admin = response.data.data.charge_admin
684
-
685
+              that.info['new_order'] = response.data.data.info
685
               that.info['p_admin'] = that.p_admin
686
               that.info['p_admin'] = that.p_admin
686
               that.info['charge_admin'] = that.charge_admin
687
               that.info['charge_admin'] = that.charge_admin
687
               that.info['order_number'] = response.data.data.order_number
688
               that.info['order_number'] = response.data.data.order_number
779
                 }
780
                 }
780
               }
781
               }
781
               console.log(response.data.data.order_infos)
782
               console.log(response.data.data.order_infos)
783
+              console.log(that.info)
782
 
784
 
783
               var list = []
785
               var list = []
784
               //获取所有项目类型进行去重
786
               //获取所有项目类型进行去重

+ 4 - 2
src/xt_pages/outpatientCharges/statementTemplate/printtwelve.vue View File

53
         </tr>
53
         </tr>
54
         <tr>
54
         <tr>
55
           <td colspan="2">身份证号</td>
55
           <td colspan="2">身份证号</td>
56
-          <td colspan="2">{{info.new_order.id_card_no}}</td>
56
+          <td colspan="2">{{info.patient.id_card_no}}</td>
57
           <td colspan="2">险种</td>
57
           <td colspan="2">险种</td>
58
           <td colspan="2" v-if="info.new_order.insutype == '310'">职工基本医疗保险</td>
58
           <td colspan="2" v-if="info.new_order.insutype == '310'">职工基本医疗保险</td>
59
           <td colspan="2" v-if="info.new_order.insutype == '320'">公务员医疗补助</td>
59
           <td colspan="2" v-if="info.new_order.insutype == '320'">公务员医疗补助</td>
92
           <td colspan="2">{{info.new_order.medfee_sumamt}}</td>
92
           <td colspan="2">{{info.new_order.medfee_sumamt}}</td>
93
           <td colspan="2">{{info.new_order.inscp_scp_amt?info.new_order.inscp_scp_amt:''}}</td>
93
           <td colspan="2">{{info.new_order.inscp_scp_amt?info.new_order.inscp_scp_amt:''}}</td>
94
           <td colspan="2">{{info.new_order.preselfpay_amt?info.new_order.preselfpay_amt:''}}</td>
94
           <td colspan="2">{{info.new_order.preselfpay_amt?info.new_order.preselfpay_amt:''}}</td>
95
-          <td colspan="1">{{info.new_order.fulamt_ownpay_amt?info.new_order.fulamt_ownpay_amt:''}}</td>
95
+          <td colspan="1" v-if="info.new_order.is_medicine_insurance == 1">{{info.new_order.fulamt_ownpay_amt?info.new_order.fulamt_ownpay_amt:''}}</td>
96
+          <td colspan="1" v-else>{{info.new_order.medfee_sumamt}}</td>
97
+
96
           <td colspan="1">{{info.new_order.overlmt_self_pay?info.new_order.overlmt_self_pay:''}}</td>
98
           <td colspan="1">{{info.new_order.overlmt_self_pay?info.new_order.overlmt_self_pay:''}}</td>
97
         </tr>
99
         </tr>
98
 
100