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

src/xt_pages/dialysis/batch_print/batch_print_order_eightythree.vue

@@ -254,6 +254,8 @@
                         showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
                       <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('人造血管') != -1 ? true : false"
                         showValue="人造血管"></label-box>&nbsp;
+                        <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('股静脉') != -1 ? true : false"
+                        showValue="股静脉"></label-box>&nbsp;
                       其他:
                       <div style="display: inline-block;" 
                         v-if="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('内瘘') == -1 &&

src/xt_pages/dialysis/template/DialysisPrintOrdereightythree.vue

@@ -244,6 +244,8 @@
                   showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') != -1 ? true : false"
                   showValue="人造血管"></label-box>&nbsp;
+                  <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') != -1 ? true : false"
+                  showValue="股静脉"></label-box>&nbsp;
                 其他:
                 <div style="display: inline-block;" 
                   v-if="predialysis.blood_access_part_opera_name.indexOf('内瘘') == -1 &&

src/xt_pages/hospitalStation/hospitalBatchStatementPrint.vue

@@ -13,7 +13,7 @@
       >
     </template>
 
-    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0">
+    <div class='dialysisPage' style="padding-top:40px;" >
       <hospital-batch-print :infos="infos"></hospital-batch-print>
     </div>
   </div>

src/xt_pages/outpatientTool/components/allgather.vue

@@ -46,11 +46,6 @@
       <el-table-column align="center" prop="price" label="费用">
         <template slot-scope="scope">{{ scope.row.price.toFixed(2) }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="sum" label="费用总额">
-        <template slot-scope="scope">
-          <div>{{ scope.row.sum.toFixed(2) }}</div>
-        </template>
-      </el-table-column>
 
     </el-table>
   </div>
@@ -147,7 +142,8 @@ export default {
         end_time: end_time,
         type: 0,
         keyword: this.keywords,
-        time_type: this.item_time_type
+        time_type: this.item_time_type,
+        s_type: 1,
       }
       GetSummaryDetail(params).then(response => {
         if (response.data.state == 0) {
@@ -163,7 +159,10 @@ export default {
           this.tableData = []
           this.all_table_data = []
 
-          let tempData = response.data
+          let tempDataTwo = response.data.Results
+          console.log(tempDataTwo)
+
+          let tempData = response.data.Patients
           tempPatientsTwo = tempData
 
           let infos = this.unique2(tempPatientsTwo)
@@ -186,10 +185,113 @@ export default {
 
             this.tableData.push(obj)
           }
-          for(let i = 0; i < this.tableData.length;i++){
-            this.tableData[i].sum = sum
+          if (tempDataTwo.length > 0){
+            let obj = {
+              'price': tempDataTwo[0].TotalMedicalFee,
+              'item_name': "医疗费总额"
+            }
+            this.tableData.push(obj)
+
+            let obj1 = {
+              'price': tempDataTwo[0].Fund,
+              'item_name': "基金支付总金额"
+            }
+            this.tableData.push(obj1)
+
+
+            let obj2 = {
+              'price': tempDataTwo[0].AcctPay,
+              'item_name': "个人账户支付总金额"
+            }
+            this.tableData.push(obj2)
+
+
+            let obj3 = {
+              'price': tempDataTwo[0].PsnPay,
+              'item_name': "个人自付总金额"
+            }
+            this.tableData.push(obj3)
+
+            let obj4 = {
+              'price': tempDataTwo[0].PoolFundPay,
+              'item_name': "基金统筹总金额"
+            }
+            this.tableData.push(obj4)
+
+
+            let obj5 = {
+              'price': tempDataTwo[0].DaE,
+              'item_name': "大额支付总金额"
+            }
+            this.tableData.push(obj5)
+
+
+            let obj6 = {
+              'price': tempDataTwo[0].XianXing,
+              'item_name': "先行自付总金额"
+            }
+            this.tableData.push(obj6)
+
+
+
+            let obj7 = {
+              'price': tempDataTwo[0].QuanZiFei,
+              'item_name': "全自费总金额"
+            }
+            this.tableData.push(obj7)
+
+            let obj8 = {
+              'price': tempDataTwo[0].YiLiaoJiuZhu,
+              'item_name': "医疗救助基金总额"
+            }
+            this.tableData.push(obj8)
+
+
+            let obj9 = {
+              'price': tempDataTwo[0].DaBing,
+              'item_name': "大病基金总额"
+            }
+            this.tableData.push(obj9)
+
+
+
+            let obj10 = {
+              'price': tempDataTwo[0].GongWuYuan,
+              'item_name': "公务员补助"
+            }
+            this.tableData.push(obj10)
+
+
+
+
+            let obj11 = {
+              'price': tempDataTwo[0].QiYe,
+              'item_name': "企业补充支付"
+            }
+            this.tableData.push(obj11)
+
+
+            let obj12= {
+              'price': tempDataTwo[0].QiTa,
+              'item_name': "其它支付"
+            }
+            this.tableData.push(obj12)
+
+
+
           }
 
+
+
+
+          let obj = {
+            'sum': 0,
+            'price': 0,
+            'cost_classify': infos[e].cost_classify,
+            'item_name': this.getName(infos[e].cost_classify)
+          }
+
+
           // for (let i = 0; i < tempPatientsThree.length; i++) {
           //   let sum = 0
           //   for (let b = 0; b < tempPatientsThree[i].length; b++) {
@@ -220,8 +322,13 @@ export default {
         return '耗材费'
       } else {
         var costClassify = getDictionaryDataConfig('system', 'cost_classify')
+        console.log(costClassify)
         var name = ''
         for (let i = 0; i < costClassify.length; i++) {
+          // console.log(cost_classify)
+          // console.log(costClassify[i].id)
+
+
           if (cost_classify == costClassify[i].id) {
             name = costClassify[i].name
           }