Browse Source

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

杨青 1 year ago
parent
commit
147382e25d

+ 9 - 9
src/router/modules/workforce.js View File

56
       noCache: true
56
       noCache: true
57
     }
57
     }
58
   },
58
   },
59
-  {//患者调班
60
-    path: '/workforce/Patientshift',
61
-    component: () => import('@/xt_pages/workforce/Patientshift'),
62
-    name: '患者调班',
63
-    meta: {
64
-      title: '患者调班',
65
-      noCache: true
66
-    }
67
-  },
59
+  // {//患者调班
60
+  //   path: '/workforce/Patientshift',
61
+  //   component: () => import('@/xt_pages/workforce/Patientshift'),
62
+  //   name: '患者调班',
63
+  //   meta: {
64
+  //     title: '患者调班',
65
+  //     noCache: true
66
+  //   }
67
+  // },
68
   {
68
   {
69
     path: '/workforce/schedule/printone',
69
     path: '/workforce/schedule/printone',
70
     component: () => import('@/xt_pages/workforce/printOne'),
70
     component: () => import('@/xt_pages/workforce/printOne'),

+ 2 - 2
src/xt_pages/outpatientCharges/listPrint.vue View File

14
     </template>
14
     </template>
15
 
15
 
16
     <div class='dialysisPage' style="padding-top:40px;">
16
     <div class='dialysisPage' style="padding-top:40px;">
17
-      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id!=0 " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
17
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485  " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
18
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
18
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
19
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
19
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
20
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
20
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
21
-     <list-print-three v-if="org_id == 10215 || org_id==9675 || org_id == 0 || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
21
+     <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
22
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
22
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
23
     </div>
23
     </div>
24
   </div>
24
   </div>

+ 1 - 1
src/xt_pages/outpatientCharges/settlementTemplate/printOne.vue View File

1
 <template>
1
 <template>
2
     <div id="prescription-print" class="print_page_main_content">
2
     <div id="prescription-print" class="print_page_main_content">
3
-        <div class="title">广东省社会医疗保障基金结算清单</div>
3
+        <div class="title" v-if="">广东省社会医疗保障基金结算清单</div>
4
         <div style="text-align:right;">清单流水号 <div style="width:120px;" class="under_line">{{ info.mdtrt_id }}</div></div>
4
         <div style="text-align:right;">清单流水号 <div style="width:120px;" class="under_line">{{ info.mdtrt_id }}</div></div>
5
         <div class="row">
5
         <div class="row">
6
             <div>定点医疗机构名称<div style="width:120px;" class="under_line">{{info.fixmedins_name}}</div></div>
6
             <div>定点医疗机构名称<div style="width:120px;" class="under_line">{{info.fixmedins_name}}</div></div>

+ 4 - 0
src/xt_pages/outpatientCharges/statementPrint.vue View File

486
           obj['count'] = details[a].cnt
486
           obj['count'] = details[a].cnt
487
           obj['price'] = parseFloat(details[a].pric)
487
           obj['price'] = parseFloat(details[a].pric)
488
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
488
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
489
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
490
+
489
           list.push(obj)
491
           list.push(obj)
490
         }
492
         }
491
 
493
 
497
           obj['spec'] = ""
499
           obj['spec'] = ""
498
           obj['count'] = details[a].cnt
500
           obj['count'] = details[a].cnt
499
           obj['price'] = parseFloat(details[a].pric)
501
           obj['price'] = parseFloat(details[a].pric)
502
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
500
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
503
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
501
           list.push(obj)
504
           list.push(obj)
502
         }
505
         }
509
           obj['spec'] = details[a].project.good_info.specification_name
512
           obj['spec'] = details[a].project.good_info.specification_name
510
           obj['count'] = details[a].cnt
513
           obj['count'] = details[a].cnt
511
           obj['price'] = parseFloat(details[a].pric)
514
           obj['price'] = parseFloat(details[a].pric)
515
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
512
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
516
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
513
           list.push(obj)
517
           list.push(obj)
514
         }
518
         }

+ 3 - 0
src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue View File

65
           <td width="8.1%">单价</td>
65
           <td width="8.1%">单价</td>
66
           <td width="8.1%">金额</td>
66
           <td width="8.1%">金额</td>
67
           <td width="10.1%">医保标识</td>
67
           <td width="10.1%">医保标识</td>
68
+          <td width="10.1%">自付金额</td>
69
+
68
         </tr>
70
         </tr>
69
         <!-- width="72.6%"  16.82%  16.1-->
71
         <!-- width="72.6%"  16.82%  16.1-->
70
         <tr>
72
         <tr>
85
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
87
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
86
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
88
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
87
                 <div style="width: 10.1%;padding: 5px;"></div>
89
                 <div style="width: 10.1%;padding: 5px;"></div>
90
+                <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
88
               </div>
91
               </div>
89
             </div>
92
             </div>
90
           </td>
93
           </td>

+ 37 - 5
src/xt_pages/outpatientCharges/summary.vue View File

124
           <!--          </el-button-->
124
           <!--          </el-button-->
125
           <!--          >-->
125
           <!--          >-->
126
 
126
 
127
-<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
127
+           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
128
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
128
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
129
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
129
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
130
-<!--           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
130
+           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>
131
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
131
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
132
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
132
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
133
 
133
 
1280
                 name: order.patient.name,
1280
                 name: order.patient.name,
1281
                 id_card_no: order.patient.id_card_no,
1281
                 id_card_no: order.patient.id_card_no,
1282
                 year: "2023",
1282
                 year: "2023",
1283
-                month: "07",
1283
+                month: "08",
1284
                 code: data[b].code,
1284
                 code: data[b].code,
1285
                 pric: data[b].total ,
1285
                 pric: data[b].total ,
1286
                 item_name: data[b].name,
1286
                 item_name: data[b].name,
1672
           var tarList = []
1672
           var tarList = []
1673
           for (let i = 0; i < list.length; i++) {
1673
           for (let i = 0; i < list.length; i++) {
1674
             let obj = {
1674
             let obj = {
1675
-              "周期": "2023年第二季度",
1675
+              "周期": "2022年第二季度",
1676
               "类别": "门诊",
1676
               "类别": "门诊",
1677
               "医保目录编码": list[i].code,
1677
               "医保目录编码": list[i].code,
1678
               "医保目录名称": list[i].name,
1678
               "医保目录名称": list[i].name,
2413
         case '01':
2413
         case '01':
2414
           return '床位费'
2414
           return '床位费'
2415
           break
2415
           break
2416
+        case '1':
2417
+          return '床位费'
2418
+          break
2416
         case '02':
2419
         case '02':
2417
           return '诊察费'
2420
           return '诊察费'
2418
 
2421
 
2422
+          break
2423
+        case '2':
2424
+          return '诊察费'
2419
           break
2425
           break
2420
         case '03':
2426
         case '03':
2421
           return '检查费'
2427
           return '检查费'
2422
 
2428
 
2429
+          break
2430
+        case '3':
2431
+          return '检查费'
2432
+
2423
           break
2433
           break
2424
         case '04':
2434
         case '04':
2425
           return '化验费'
2435
           return '化验费'
2426
           break
2436
           break
2437
+        case '4':
2438
+          return '化验费'
2439
+          break
2427
         case '05':
2440
         case '05':
2428
           return '治疗费'
2441
           return '治疗费'
2429
 
2442
 
2443
+          break
2444
+        case '5':
2445
+          return '治疗费'
2446
+
2430
           break
2447
           break
2431
         case '06':
2448
         case '06':
2432
           return '手术费'
2449
           return '手术费'
2433
 
2450
 
2451
+          break
2452
+        case '6':
2453
+          return '手术费'
2454
+
2434
           break
2455
           break
2435
         case '07':
2456
         case '07':
2436
           return '护理费'
2457
           return '护理费'
2437
 
2458
 
2459
+          break
2460
+        case '7':
2461
+          return '护理费'
2462
+
2438
           break
2463
           break
2439
         case '08':
2464
         case '08':
2440
           return '材料费'
2465
           return '材料费'
2441
 
2466
 
2467
+          break
2468
+        case '8':
2469
+          return '材料费'
2470
+
2442
           break
2471
           break
2443
         case '09':
2472
         case '09':
2444
           return '西药费'
2473
           return '西药费'
2445
 
2474
 
2475
+          break
2476
+        case '9':
2477
+          return '西药费'
2478
+
2446
           break
2479
           break
2447
         case '10':
2480
         case '10':
2448
           return '中药饮片费'
2481
           return '中药饮片费'
2465
         case '0':
2498
         case '0':
2466
           return '其他费'
2499
           return '其他费'
2467
           break
2500
           break
2468
-
2469
       }
2501
       }
2470
 
2502
 
2471
     },
2503
     },