Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,10 +14,11 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id == 10191" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      
       <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191"
         :list="list" :patient="patient" :order="order" :admin="admin">
       </listPrintforu>
+      <printOne v-if="org_id == 10191" :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>-->
@@ -171,7 +172,8 @@
                 let obj = {
                   med_chrgitm_type: this.getType(infos.med_chrgitm_type),
                   price: infos.pric.toFixed(4),
-                  count: infos.cnt
+                  count: infos.cnt,
+                  selfpay_prop:infos.selfpay_prop,
                 }
                 if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
                   obj['p_time'] = this.getTimes(infos.project.prescription.ctime)

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -24,25 +24,30 @@
         
         <table class="listTable" style="text-align: center;">
             <tr style="border-bottom: 1px solid black;">
-              <td style="width:30%">医保编码</td>
+              <td style="width:25%">医保编码</td>
               <td style="width:25%">项目名称</td>
               <td style="width:15%">规格</td>
               <td style="width:5%">数量</td>
               <td style="width:5%">单位</td>
               <td style="width:8%">单价(元)</td>
               <td style="width:8%">金额(元)</td>
+              <td style="width:8%">自负比例</td>
             </tr>
             <tr v-for="(item,index) in list" style="line-height: 30px;">
                 <!-- <template v-if="index == (list.length)-1">
                     <tr style="border-bottom: 1px solid black;"></tr>
                 </template> -->
-                <td style="width:30%">{{item.code}}</td>
+                <td style="width:25%">{{item.code}}</td>
                 <td style="width:25%">{{item.name}}</td>
                 <td style="width:15%">{{item.spec}}</td>
                 <td style="width:5%">{{item.count}}</td>
                 <td style="width:5%">{{item.unit}}</td>
                 <td style="width:8%">{{(item.price*1).toFixed(2)}}</td>
                 <td style="width:8%">{{(item.price * item.count).toFixed(2)}}</td>
+                <td style="width:8%">
+                  {{(item.selfpay_prop)*100}}
+                  <span v-if="item.selfpay_prop !=''">%</span>
+                </td>
             </tr>
         </table>
         <div style="border-top: 1px solid black;">
@@ -139,8 +144,7 @@ export default {
               this.pageArr.push(num)
           }
       }
-     
-      console.log('this.pageArr',this.pageArr);
+      console.log('this.pageArr',this.list);
     },
     getlist(){
       // if(this.list.length <= 17){

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -951,6 +951,10 @@ export default {
                 response.data.data.treatCostSelfTotal
               that.info['treat_cost_part_self_total'] =
                 response.data.data.treatCostPartSelfTotal
+
+
+
+
               that.info['date'] = response.data.data.date
               that.info['number'] = response.data.data.number
               that.info['order_infos'] = response.data.data.order_infos
@@ -1234,6 +1238,8 @@ export default {
               that.info['order_infos'] = response.data.data.order_infos
               that.info['diagnosis'] = response.data.data.diagnosis
 
+
+
               let list = []
               for (let i = 0; i < response.data.data.order_infos.length; i++) {
                 let order = response.data.data.order_infos[i]
@@ -1380,6 +1386,9 @@ export default {
                   response.data.data.treatCostSelfTotal
                 that.info['treat_cost_part_self_total'] =
                   response.data.data.treatCostPartSelfTotal
+
+
+
                 that.info['date'] = response.data.data.date
                 that.info['number'] = response.data.data.number
                 that.info['order_infos'] = response.data.data.order_infos
@@ -1845,7 +1854,14 @@ export default {
                     funds.push(objs)
                   }
                   that.info['funds'] = funds
-                  console.log(that.info)
+
+                  that.info['zc_cost_total'] =
+                    response.data.data.zcCostTotal
+                  that.info['zc_cost_self_total'] =
+                    response.data.data.zcCostSelfTotal
+                  that.info['zc_cost_part_self_total'] =
+                    response.data.data.zcCostPartSelfTotal
+
                 }
               })
               .catch(function(error) {

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -243,10 +243,10 @@
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-        <td style="text-align:right;padding-right:10px;"></td>
-        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
-        <td style="text-align:right;padding-right:10px;"></td>
-        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+        <td>诊察费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.zc_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_part_self_total}}</td>
       </tr>
       <tr>
         <td>合计</td>
@@ -254,20 +254,20 @@
           parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
           parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
-          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)+ parseFloat(info.zc_cost_total)).toFixed(2) }}
         </td>
         <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_total)).toFixed(2)}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
-          parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+          parseFloat(info.treat_cost_part_self_total) + parseFloat(info.zc_cost_part_self_total)).toFixed(2)}}
         </td>
 
         <td>报销比例</td>

src/xt_pages/outpatientCharges/summary.vue

@@ -290,6 +290,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column align="center" width="90" prop="name" label="险种类型">
+          <template slot-scope="scope">
+            <div v-if="scope.row.insutype == '390'">
+              城乡居民
+            </div>
+            <div v-if="scope.row.insutype == '310'">
+              职工
+            </div>
+          </template>
+        </el-table-column>
+
 
         <el-table-column align="center" width="90" prop="name" label="就诊凭证类型">
           <template slot-scope="scope">