2 Ревизии fcd1d85970 ... eebfdc97be

Автор SHA1 Съобщение Дата
  陈少旭 eebfdc97be Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch преди 3 седмици
  陈少旭 2a993e20b1 1111 преди 3 седмици

+ 12 - 7
src/xt_pages/outpatientCharges/allListPrint.vue Целия файл

@@ -13,10 +13,10 @@
13 13
     </template>
14 14
 <!--  -->
15 15
     <div class='dialysisPage' style="padding-top:40px;">
16
-      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=10644 && org_id !=0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
16
+      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=10644" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
17 17
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
18 18
       <printTwo v-if="org_id==10515 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
19
-      <printthree  v-if="org_id == 10489 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
19
+      <printthree  v-if="org_id == 10489" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
20 20
       <printFour v-if="org_id == 10644 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printFour>
21 21
       <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
22 22
     </div>
@@ -63,7 +63,7 @@
63 63
     methods: {
64 64
       getTimes(time) {
65 65
         return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
66
-      }, 
66
+      },
67 67
       getInfo(order_id) {
68 68
         let params = {
69 69
           id: order_id
@@ -147,7 +147,7 @@
147 147
                   }
148 148
                   advice.push(adv)
149 149
                 }
150
-               
150
+
151 151
                 if(order_info[i].project.good_info.good_name !=''){
152 152
                   const god={
153 153
                     // advice_name:order_info[i].advice.advice_name,
@@ -225,7 +225,7 @@
225 225
               }
226 226
 
227 227
               chrgitm_lvs = [...advice,...good,...project]
228
-              
228
+
229 229
               for(let i in this.list){
230 230
                 for(let j in chrgitm_lvs){
231 231
                   if(this.list[i].is_total ==2){
@@ -242,8 +242,8 @@
242 242
             }
243 243
           }
244 244
         })
245
-        
246
-      }, 
245
+
246
+      },
247 247
       getquchong(arr){
248 248
         for(let i=0;i<arr.length;i++){
249 249
           for(let j=i+1;j<arr.length;j++){
@@ -305,6 +305,8 @@
305 305
             for (let a = 0; a < details.length; a++) {
306 306
               if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
307 307
                 obj['name'] = details[a].advice.advice_name
308
+                obj['code'] = details[a].advice.drug.medical_insurance_number
309
+
308 310
                 // obj['spec'] = details[a].advice.drug.drug_spec
309 311
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
310 312
                 obj['unit'] = details[a].advice.prescribing_number_unit
@@ -329,6 +331,8 @@
329 331
                if( details[a].project.type == 2){
330 332
                  obj['name'] = details[a].project.project.project_name
331 333
                  obj['spec'] = ''
334
+                 obj['code'] = details[a].project.project.medical_code
335
+
332 336
                   // obj['spec'] = details[a].project.project.project_name
333 337
                  obj['unit'] = details[a].project.project.unit
334 338
 
@@ -336,6 +340,7 @@
336 340
                }else if(details[a].project.type == 3){
337 341
                  obj['name'] = details[a].project.good_info.good_name
338 342
                 //  obj['spec'] = ''
343
+                 obj['code'] = details[a].project.good_info.medical_insurance_number
339 344
                  obj['spec'] = details[a].project.good_info.specification_name
340 345
                  obj['unit'] = details[a].project.good_info.packing_unit
341 346
 

+ 11 - 7
src/xt_pages/outpatientCharges/allListTemplate/printOne.vue Целия файл

@@ -7,7 +7,7 @@
7 7
         <div>透析号:{{ patient.dialysis_no }}</div>
8 8
         <div>性别:{{ patient.gender == 1 ? '男' : '女' }}</div>
9 9
         <div>年龄:{{ patient.age }} 岁</div>
10
-        <div v-if="$store.getters.xt_user.org_id  == 10644 || 
10
+        <div v-if="$store.getters.xt_user.org_id  == 10644 ||
11 11
               $store.getters.xt_user.org_id  == 0">开方日期:{{ getTimes(order.settle_accounts_date) }}
12 12
           <!-- {{ hospital.in_hosptial_time }} 至
13 13
           {{ hospital.out_hosptial_time }} -->
@@ -16,28 +16,32 @@
16 16
       </div>
17 17
       <table class="allListTable" border="1">
18 18
         <tr>
19
+          <td style="width:10%">医保编码</td>
19 20
           <td style="width:10%">类别</td>
20
-          <td style="width:40%">项目名称</td>
21
+          <td style="width:30%">项目名称</td>
21 22
           <td style="width:10%">规格</td>
23
+          <td style="width:5%">单位</td>
22 24
           <td style="width:10%">单价(元)</td>
23 25
           <td style="width:10%">数量</td>
24 26
           <td style="width:10%">金额(元)</td>
27
+          <td style="width:40%">医保类型</td>
28
+
25 29
           <!-- <td style="width:10%" v-if="org_id==10489 ||org_id==0">报销等级</td> -->
26 30
         </tr>
27 31
         <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
28 32
           <tr v-if="item.is_total == 2">
33
+            <td style="width:10%">{{ item.code }}</td>
29 34
             <td style="width:10%">{{ item.med_chrgitm_type }}</td>
30
-            <td style="width:40%">{{ item.name }}</td>
35
+            <td style="width:30%">{{ item.name }}</td>
31 36
             <td style="width:10%">{{ item.spec }}</td>
37
+            <td style="width:5%">{{ item.unit }}</td>
32 38
             <td style="width:10%">{{ (item.price).toFixed(2) }}</td>
33 39
             <td style="width:10%">{{ item.count }}{{ item.unit }}</td>
34 40
             <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
35
-            <!-- <td style="width:10%" v-if="org_id==10489 ||org_id==0">
36
-              {{item.chrgitm_lv!=''?getMedicineInsuranceType(item.chrgitm_lv): '丙类' }}
37
-            </td> -->
41
+            <td style="width:10%">{{item.medicine_insurance_kind}}</td>
38 42
           </tr>
39 43
           <tr>
40
-            <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计:{{ item.total }}元</td>
44
+            <td colspan="9" style="text-align:right;" v-if="item.is_total == 1">合计:{{ item.total }}元</td>
41 45
           </tr>
42 46
         </template>
43 47
       </table>

+ 2 - 2
src/xt_pages/outpatientCharges/invoicePrint.vue Целия файл

@@ -15,7 +15,7 @@
15 15
       size="small" type="success"
16 16
       @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>
17 17
     </template>
18
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
18
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567  && org_id != 10724 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
19 19
         <div class='dialysisPage'>
20 20
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0" >
21 21
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
@@ -51,7 +51,7 @@
51 51
       </div>
52 52
     </div>
53 53
 
54
-    <div class="app-container" v-if="org_id == 10567 ">
54
+    <div class="app-container" v-if="org_id == 10567  || org_id == 10724">
55 55
       <div class='dialysisPage'>
56 56
         <printfourteen :paramsObj="invoiceParams"></printfourteen>
57 57
       </div>

+ 6 - 5
src/xt_pages/outpatientCharges/statementPrint.vue Целия файл

@@ -20,6 +20,7 @@
20 20
           org_id == 10138 ||
21 21
           org_id == 9504 ||
22 22
           org_id == 10028 ||
23
+          org_id == 10744 ||
23 24
           org_id == 10278 ||
24 25
           org_id == 10610 ||
25 26
           org_id==10537
@@ -33,7 +34,7 @@
33 34
           v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537"
34 35
         ></printThree>
35 36
         <printFour
36
-          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 "
37
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088  || org_id == 10744"
37 38
           :info="info"
38 39
           :paramsObj="paramsObj"
39 40
           :balanceAccounts="balanceAccounts"
@@ -73,14 +74,14 @@
73 74
       <printSeventheen  :info="info" v-if=" org_id == 10721"></printSeventheen>
74 75
       <printeighteen :info="info" v-if=" org_id == 10726"></printeighteen>
75 76
       <printOne :info="info" v-if=" org_id != 9990 && org_id !=0 &&
76
-            org_id != 10138 && org_id != 9504 && org_id != 10028 &&
77
+            org_id != 10138 && org_id != 9504 && org_id != 10028  && org_id != 10744 &&
77 78
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
78 79
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&
79 80
             org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&
80 81
             org_id != 10510 &&org_id != 10088 && org_id != 10721 &&org_id != 10633 &&org_id != 10731 && org_id != 10726 && this.paramsObj.balance_accounts_type == 1">
81 82
       </printOne>
82 83
       <privateChargePrint :info="info" v-if="org_id != 9990 && org_id !=0 &&
83
-            org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
84
+            org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id != 10744  && org_id !=10697 &&
84 85
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
85 86
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
86 87
             org_id != 10510 &&org_id != 10633 && org_id != 10721 && org_id != 10726  && this.paramsObj.balance_accounts_type == 2">
@@ -442,7 +443,7 @@ export default {
442 443
         }, 500)
443 444
       } else if (
444 445
         this.$store.getters.xt_user.org_id == 9504 ||
445
-        this.$store.getters.xt_user.org_id == 10028
446
+        this.$store.getters.xt_user.org_id == 10028 ||   this.$store.getters.xt_user.org_id == 10744
446 447
       ) {
447 448
         const style =
448 449
           '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}'
@@ -840,7 +841,7 @@ export default {
840 841
               // console.log('this.num', this.num)
841 842
             }
842 843
           })
843
-        } else if (this.org_id == 10028  || this.org_id == 9504) {
844
+        } else if (this.org_id == 10028  || this.org_id == 9504 || this.org_id == 10744) {
844 845
           getPrivateExpenses(params).then((response) => {
845 846
             if (response.data.state == 0) {
846 847
               // this.$message.error(response.data.msg)