提交代码

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -145,11 +145,11 @@
       <tr>
         <td>床位费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.bed_cost_self_total + info.bedSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
         <td>西成药</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.western_medicine_cost_self_total + info.westernMedicineSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
       </tr>
       <tr>
@@ -160,7 +160,7 @@
         <td>中成药</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.chinese_traditional_medicine_cost_self_total + info.chineseTraditionalSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">
           {{info.chinese_traditional_medicine_cost_part_self_total}}
         </td>
@@ -172,13 +172,13 @@
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.check_cost_self_total + info.checkSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
       </tr>
       <tr>
         <td>治疗费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.treat_cost_self_total + info.treatSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
         <td>放射费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
@@ -188,11 +188,11 @@
       <tr>
         <td>手术费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.operation_cost_self_total + info.operationSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
         <td>化验费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.laboratory_cost_self_total + info.laboratorySelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
       </tr>
       <tr>
@@ -208,7 +208,7 @@
       <tr>
         <td>其他</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.other_cost_self_total + info.otherSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
         <td>麻醉费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
@@ -218,7 +218,7 @@
       <tr>
         <td>材料费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.material_cost_self_total + info.materialSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
         <td>特殊检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
@@ -243,11 +243,11 @@
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
           parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_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)}}
+        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+parseFloat(info.bedSelfTotal)+
+          parseFloat(info.operation_cost_self_total)+parseFloat(info.operationSelfTotal) + parseFloat(info.other_cost_self_total) +parseFloat(info.otherSelfTotal)+
+          parseFloat(info.material_cost_self_total) + parseFloat(info.materialSelfTotal)  + parseFloat(info.western_medicine_cost_self_total) + parseFloat(info.westernMedicineSelfTotal) +
+          parseFloat(info.chinese_traditional_medicine_cost_self_total)  +  parseFloat(info.chineseTraditionalSelfTotal)  + parseFloat(info.check_cost_self_total) + parseFloat(info.checkSelfTotal) +
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.laboratorySelfTotal)  + parseFloat(info.treat_cost_self_total) +parseFloat(info.treatSelfTotal) ).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) +

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,11 +10,11 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 0 && org_id != 10485 && org_id != 10375"><!---->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
-            <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+          <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" >
+            <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
+            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -27,7 +27,7 @@
         </div>
     </div>
 
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485  || org_id == 0">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485">
       <div class='dialysisPage'>
         <print-eleven :paramsObj="invoiceParams"></print-eleven>
       </div>

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -38,15 +38,14 @@
             </tr>
         </table>
         <div class="tableBottom">
-            <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
-            <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
-            <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+          <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
+          <div class="tableBottomOne" v-if="$store.getters.xt_user.org.id != 10318">制表日期：{{ getNowTime()}}</div>
+          <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
           <div class="tableBottomOne">基金总额：{{order.fund_pay_sumamt}}元</div>
           <div class="tableBottomOne">统筹支付：{{order.hifp_pay}}元</div>
           <div class="tableBottomOne">医疗救助：{{order.maf_pay}}元</div>
           <div class="tableBottomOne">医保报销：{{order.fund_pay_sumamt}}元</div>
           <div class="tableBottomOne">个人支付：{{order.psn_cash_pay}}元</div>
-
         </div>
         </div>
     </div>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -15,7 +15,7 @@
           :prescription_id="prescription_id"
         ></print-ten-one>
 
-        <prinSeven v-if="org_id == 10375 || org_id == 0"
+        <prinSeven v-if="org_id == 10375 "
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientTool/garherinvoice_lingshang.vue

@@ -31,7 +31,7 @@
         </div>
         <div style=" width: 608px;min-height: 200px;">
           <div style="display:flex;justify-content: space-around;">
-            
+
             <div style="">西药费</div>
             <div style="">{{getWesternMedicineCostTotal()}}</div>
             <div style="">检查费</div>
@@ -41,7 +41,7 @@
           </div>
 
           <div style="display:flex;justify-content: space-around;">
-           
+
             <div style="">床位费</div>
             <div style="">{{getBedCostTotal()}}</div>
             <div style="position:  relative;left: -15px;">中成药</div>
@@ -67,7 +67,7 @@
           </div>
         </div>
         <div style="border-top:1px solid black;width: 608px;">
-          
+
           <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:{{smalltoBIG(getAllPice())}}</span>
             <!-- <span>
@@ -124,14 +124,14 @@
           <div style="width:140px">兜底支付：</div>
         </div>
         <div style="display:flex;margin-bottom: 3px;">
-          <div style="width:140px">个人自付：</div>
+          <div style="width:140px">个人自付：{{getAllPice()}}</div>
           <div style="width:140px">个账支付：</div>
           <div style="width:140px">个账余额：</div>
         </div>
       </div>
       <div style="width:608px;font-Size:12px">
         <div style="display:flex;margin: 3px 0px;">
-          <div style="width:140px">现金支付：</div>
+          <div style="width:140px">现金支付：{{getAllPice()}}</div>
           <div style="width:140px">预存扣减：</div>
           <div style="width:140px">预存余额：</div>
         </div>
@@ -140,14 +140,14 @@
           <div style="width:140px">收款人：{{getAdminRole(admin_user_id)}}</div>
         </div>
       </div>
-      
+
   </div>
       <!-- <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用发票</div>
       <div class="listTitle_1">{{$store.getters.xt_user.org.org_name}}发票联<span>收</span></div>
        <div class="listInfo">
           <div>收费日期：{{this.$route.query.end_time}}</div>
           <div style="width:400px">发票代码：
-           <span>{{orderInfo.fa_piao_code}}</span> 
+           <span>{{orderInfo.fa_piao_code}}</span>
           </div>
       </div>
       <table class="listTable" table border rules=none cellspacing=0 align=center>
@@ -249,6 +249,11 @@ export default {
         doctorlist:[],
         orderInfo:{},
         his_record_patient:{},
+
+        dabing_cost:0,
+        dabing_cost:0,
+
+
       }
   },
   methods:{
@@ -297,7 +302,7 @@ export default {
           return false
         } else {
         this.drugTypeList =response.data.data.drugTypeList
-        this.costClassifyList = response.data.data.costClassifyList 
+        this.costClassifyList = response.data.data.costClassifyList
         this.doctorlist = response.data.data.doctorlist
         var list = response.data.data.list
         console.log("listw3232323223",list)
@@ -332,7 +337,7 @@ export default {
           }
         }
         console.log("order_info222222222222",order_info)
-        
+
         //合并，相同的合并在一起
 
         let dataInfo = {}
@@ -360,8 +365,8 @@ export default {
           }
           dataInfo[item_id].child.push(item)
         })
-        let arr = Object.values(dataInfo) 
-        
+        let arr = Object.values(dataInfo)
+
         for(let i=0;i<arr.length;i++){
           for(let j=0;j<arr[i].child.length;j++){
              if(arr[i].advice_id >0){
@@ -372,8 +377,8 @@ export default {
                 arr[i].unit = arr[i].child[0].advice.prescribing_number_unit
                 arr[i].cost_type = arr[i].child[0].advice.drug.drug_type
                 arr[i].medical_insurance_level = arr[i].child[0].advice.drug.medical_insurance_level
-               
-               
+
+
              }
              if(arr[i].project_id > 0){
                 arr[i].record_date = arr[i].child[0].project.record_date
@@ -417,14 +422,14 @@ export default {
         this.hisDepatment =  response.data.data.hisDepatment
         this.order =  response.data.data.order
         this.his_record_patient = response.data.data.his_record_patient
-        this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList  
+        this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
         this.orderInfo = response.data.data.orderInfo
         if(this.$route.query.id == 1){
            var new_arr = []
            for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].type == 1){
                 new_arr.push(this.tableList[i])
-              }  
+              }
            }
            this.tableList = []
            this.tableList = new_arr
@@ -434,7 +439,7 @@ export default {
            for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].type == 2){
                 new_arr.push(this.tableList[i])
-              }  
+              }
            }
            this.tableList = []
            this.tableList = new_arr
@@ -444,7 +449,7 @@ export default {
            for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].type == 3){
                 new_arr.push(this.tableList[i])
-              }  
+              }
            }
            this.tableList = []
            this.tableList = new_arr
@@ -493,10 +498,10 @@ export default {
         }
 
       }
-    
+
       let new_drug_ids = this.unique(drug_ids)
       let new_project_ids = this.unique(project_ids)
-     
+
       let list = []
       if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
         for (let i = 0; i < new_drug_ids.length; i++) {
@@ -531,13 +536,13 @@ export default {
                obj['name'] = details[a].project.project.project_name
                obj['spec'] = ''
                obj['unit'] = details[a].project.project.unit
-              
+
 
              }else if(details[a].project.type == 3){
                obj['name'] = details[a].project.good_info.good_name
                obj['spec'] = ''
                obj['unit'] = details[a].project.good_info.packing_unit
-             
+
 
              }
               obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
@@ -551,7 +556,7 @@ export default {
           }
           obj['count'] = count
           list.push(obj)
-        
+
         }
       }
 
@@ -577,7 +582,7 @@ export default {
           list.push(obj)
 
         }
-       
+
         for (let i = 0; i < new_project_ids.length; i++) {
           let obj = {}
           let count = 0
@@ -604,13 +609,13 @@ export default {
           }
           obj['count'] = count
           list.push(obj)
-        
+
         }
        }
        console.log("list232332322323332233223232323",list)
       return list
-    }, 
-  
+    },
+
     getMedicineInsuranceType(type) {
       switch (type) {
         case "01":
@@ -726,7 +731,7 @@ export default {
     return name
   },
    smalltoBIG(n) {
-         
+
       if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
           return "数据非法";  //判断数据是否大于0
       }
@@ -809,7 +814,7 @@ export default {
           total_price += this.tableList[i].count_number * this.tableList[i].pric
        }
     }
-    
+
     return total_price.toFixed(2)
   },
   getChineseTraditionalMedicineCostTotal(){
@@ -989,7 +994,7 @@ export default {
     }else{
       return total_price
     }
-   
+
   },
   getAllPiceTwo(arr){
 
@@ -1004,7 +1009,7 @@ export default {
     }else{
       return total_price
     }
-   
+
   },
   getAdminRole(id){
     var user_name = ""
@@ -1019,7 +1024,7 @@ export default {
   created(){
     this.admin_user_id = this.$store.getters.xt_user.user.id
     console.log("admin_user_id23323232323",this.admin_user_id)
-    this.getGatherDetailList()   
+    this.getGatherDetailList()
     var data = new Date();
     var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();