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

src/router/modules/workforce.js

@@ -56,15 +56,15 @@ export default {
       noCache: true
     }
   },
-  {//患者调班
-    path: '/workforce/Patientshift',
-    component: () => import('@/xt_pages/workforce/Patientshift'),
-    name: '患者调班',
-    meta: {
-      title: '患者调班',
-      noCache: true
-    }
-  },
+  // {//患者调班
+  //   path: '/workforce/Patientshift',
+  //   component: () => import('@/xt_pages/workforce/Patientshift'),
+  //   name: '患者调班',
+  //   meta: {
+  //     title: '患者调班',
+  //     noCache: true
+  //   }
+  // },
   {
     path: '/workforce/schedule/printone',
     component: () => import('@/xt_pages/workforce/printOne'),

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,11 +14,11 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <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>
+      <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>
       <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>
       <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>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
-     <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>
+     <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>
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>

src/xt_pages/outpatientCharges/settlementTemplate/printOne.vue

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

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -486,6 +486,8 @@ export default {
           obj['count'] = details[a].cnt
           obj['price'] = parseFloat(details[a].pric)
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
+
           list.push(obj)
         }
 
@@ -497,6 +499,7 @@ export default {
           obj['spec'] = ""
           obj['count'] = details[a].cnt
           obj['price'] = parseFloat(details[a].pric)
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
           list.push(obj)
         }
@@ -509,6 +512,7 @@ export default {
           obj['spec'] = details[a].project.good_info.specification_name
           obj['count'] = details[a].cnt
           obj['price'] = parseFloat(details[a].pric)
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
           list.push(obj)
         }

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -65,6 +65,8 @@
           <td width="8.1%">单价</td>
           <td width="8.1%">金额</td>
           <td width="10.1%">医保标识</td>
+          <td width="10.1%">自付金额</td>
+
         </tr>
         <!-- width="72.6%"  16.82%  16.1-->
         <tr>
@@ -85,6 +87,7 @@
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
                 <div style="width: 10.1%;padding: 5px;"></div>
+                <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
               </div>
             </div>
           </td>

src/xt_pages/outpatientCharges/summary.vue

@@ -124,10 +124,10 @@
           <!--          </el-button-->
           <!--          >-->
 
-<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
+           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-<!--           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
@@ -1280,7 +1280,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "07",
+                month: "08",
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,
@@ -1672,7 +1672,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "周期": "2023年第二季度",
+              "周期": "2022年第二季度",
               "类别": "门诊",
               "医保目录编码": list[i].code,
               "医保目录名称": list[i].name,
@@ -2413,36 +2413,69 @@ export default {
         case '01':
           return '床位费'
           break
+        case '1':
+          return '床位费'
+          break
         case '02':
           return '诊察费'
 
+          break
+        case '2':
+          return '诊察费'
           break
         case '03':
           return '检查费'
 
+          break
+        case '3':
+          return '检查费'
+
           break
         case '04':
           return '化验费'
           break
+        case '4':
+          return '化验费'
+          break
         case '05':
           return '治疗费'
 
+          break
+        case '5':
+          return '治疗费'
+
           break
         case '06':
           return '手术费'
 
+          break
+        case '6':
+          return '手术费'
+
           break
         case '07':
           return '护理费'
 
+          break
+        case '7':
+          return '护理费'
+
           break
         case '08':
           return '材料费'
 
+          break
+        case '8':
+          return '材料费'
+
           break
         case '09':
           return '西药费'
 
+          break
+        case '9':
+          return '西药费'
+
           break
         case '10':
           return '中药饮片费'
@@ -2465,7 +2498,6 @@ export default {
         case '0':
           return '其他费'
           break
-
       }
 
     },