8月11日杨青

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -4,26 +4,6 @@
     <div class="statementTable">
       <table border="1" style="border-collapse: collapse;width: 100%;border: none;">
         <tr>
-<<<<<<< HEAD
-          <td colspan="4">医院机构名称：</td>
-          <td colspan="4">发票号：</td>
-        </tr>
-        <tr style="border-bottom: 1px solid black;">
-          <td colspan="4" >单据编码：</td>
-          <td colspan="2" >就诊时间：</td>
-          <td colspan="2" >金额单位：元</td>
-        </tr>
-        <tr>
-          <td colspan="4">姓名：</td>
-          <td colspan="4">身份证号：</td>
-        </tr>
-        <tr>
-          <td colspan="8">诊断：</td>
-        </tr>
-        <tr style="border-bottom: 1px solid black;">
-          <td colspan="4">人员类别：</td>
-          <td colspan="4">险种类型：</td>
-=======
           <td colspan="4">医院机构名称：{{info.fixmedins_name}}</td>
           <td colspan="4">发票号：</td>
         </tr>
@@ -74,7 +54,6 @@
           <td colspan="4" v-else></td>
 
 
->>>>>>> origin/20230223_pc_vue_new_branch
         </tr>
         <tr style="border-bottom: 1px solid black;text-align: center;">
           <td width="12.5%">项目</td>
@@ -88,49 +67,6 @@
         </tr>
         <tr style="text-align: center;">
           <td>西药费</td>
-<<<<<<< HEAD
-          <td>金额</td>
-          <td>化验费</td>
-          <td>金额</td>
-          <td>治疗费</td>
-          <td>金额</td>
-          <td>处置费</td>
-          <td>金额</td>
-        </tr>
-        <tr style="text-align: center;">
-          <td>中成药</td>
-          <td>金额</td>
-          <td>诊疗费</td>
-          <td>金额</td>
-          <td>材料费</td>
-          <td>金额</td>
-          <td>护理费</td>
-          <td>金额</td>
-        </tr>
-        <tr style="text-align: center;">
-          <td>注射费</td>
-          <td>金额</td>
-          <td>检查费</td>
-          <td>金额</td>
-          <td>输氧费</td>
-          <td>金额</td>
-          <td>其他</td>
-          <td>金额</td>
-        </tr>
-        <tr style="border-bottom: 1px solid black; font: 16px bolder;">
-          <td colspan="8">合计：</td>
-        </tr>
-        <tr>
-          <td colspan="8">医保基金支付金额：</td>
-        </tr>
-        <tr style="border-bottom: 1px solid black;">
-          <td colspan="8">个人现金支付金额：</td>
-        </tr>
-        <tr>
-          <td colspan="2">家属或参保人签名：</td>
-          <td colspan="2">收费员签名：</td>
-          <td colspan="2">医院盖章：</td>
-=======
           <td>{{info.western_medicine_cost_total}}</td>
           <td>化验费</td>
           <td>{{info.laboratory_cost_total}}</td>
@@ -169,10 +105,9 @@
           <td colspan="8">个人现金支付金额：{{info.psn_cash_pay}}</td>
         </tr>
         <tr>
-          <td colspan="2" >家属或参保人签名：</td>
-          <td colspan="2" >收费员签名：</td>
-          <td colspan="2" >医院盖章：</td>
->>>>>>> origin/20230223_pc_vue_new_branch
+          <td colspan="2">家属或参保人签名：</td>
+          <td colspan="2">收费员签名：</td>
+          <td colspan="2">医院盖章：</td>
         </tr>
         <tr>
           <td colspan="8">医师签名：</td>
@@ -181,8 +116,6 @@
     </div>
   </div>
 </template>
-<<<<<<< HEAD
-=======
 <script>
 import { uParseTime } from '@/utils/tools'
 
@@ -253,7 +186,6 @@ export default {
   }
 }
 </script>
->>>>>>> origin/20230223_pc_vue_new_branch
 
 <style lang="scss" scoped>
 .statement-print {
@@ -280,9 +212,4 @@ export default {
     border: none;
   }
 }
-
-<<<<<<< HEAD
-</style>
-=======
 </style>
->>>>>>> origin/20230223_pc_vue_new_branch