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

src/xt_pages/Pharmacy/drugCode.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-      <div class="cell clearfix">
+    <div style="display: flex;margin-bottom:10px;">
+      <div class="cell clearfix" style="flex: 1;">
         <span>发药时间:</span>
         <el-date-picker
           size="small"
@@ -30,50 +30,57 @@
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
         ></el-date-picker>
-      </div>
-
-
-      <div style="width:150px;">
-        <el-input  style="width: 150px"
-                   v-model="keywords" @input="searchAction"
-                   @keyup.enter.native="searchAction"
-                   class="filter-item" placeholder="请输入患者姓名"
-        />
-      </div>
-
-
-      <div>
-        <div>上传状态:
-          <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
-            <el-option
-              v-for="item,index in items"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </div>
-      </div>
 
-      <div>
-        <div>结算状态:
-          <el-select size="small" v-model="is_settle" placeholder="请选择" style="width:100px;" @change="changeSettle">
-            <el-option
-              v-for="item,index in settle_items"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
+        <div style="width:150px;display: inline-block;">
+          <el-input  style="width: 150px"
+                    v-model="keywords" @input="searchAction"
+                    @keyup.enter.native="searchAction"
+                    class="filter-item" placeholder="请输入患者姓名"
+          />
         </div>
       </div>
 
-      <div>
+      <div style="flex: 1;">
         <el-button type="primary" @click="batchUpload()">批量上传</el-button>
         <el-button type="primary" @click="query()">查询</el-button>
         <el-button type="primary" @click="exportdata()">导出</el-button>
       </div>
     </div>
+    <div style="display: flex;margin-bottom:10px;">
+     
+      <div>上传状态:
+        <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>&nbsp;&nbsp;
+
+      <div>结算状态:
+        <el-select size="small" v-model="is_settle" placeholder="请选择" style="width:100px;" @change="changeSettle">
+          <el-option
+            v-for="item,index in settle_items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>&nbsp;&nbsp;
+
+      <div>是否有溯源码:
+        <el-select size="small" v-model="is_code" placeholder="请选择" style="width:100px;" @change="changeCode">
+          <el-option
+            v-for="item,index in code_items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>&nbsp;&nbsp;
+    </div>
     <el-table v-loading="isloading" :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               max-height="800"
@@ -208,6 +215,7 @@ export default {
       start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
       end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
       is_settle:"0",
+      is_code:"0",
       tableData: [],
       change_type: "3",
       selection: [],
@@ -221,6 +229,12 @@ export default {
         {id: "1", name: '已上传'},
         {id: "2", name: '未上传'},
       ],
+      code_items:[
+        {id: "0", name: '全部'},
+        {id: "2", name: '有溯源码'},
+        {id: "1", name: '无溯源码'},
+
+      ],
       settle_items: [
         {id: "0", name: '全部'},
         {id: "2", name: '已结算'},
@@ -610,6 +624,7 @@ export default {
         limit: this.limit,
         is_sale: this.is_sale,
         is_settle:this.is_settle,
+        is_code:this.is_code,
         keywords:this.keywords,
 
       }
@@ -626,6 +641,10 @@ export default {
           this.is_open = response.data.data.codeConfig.is_open
         }
       })
+    },changeCode(val){
+      this.is_code = val
+      this.getlist()
+
     },changeSettle(val){
 
       this.is_settle = val

src/xt_pages/dialysis/batch_print/batch_print_order_eightyfour.vue

@@ -217,7 +217,7 @@
                         record.assessment_before_dislysis.point_puncture : "/" }}
                       </div>&nbsp;&nbsp;
                       <div style="flex: 1;line-height: 30px;">
-                        穿刺护士:杨能华/
+                        穿刺护士:
                         <span v-if="setAdminUserES( record.dialysis_order,'puncture_nurse') == ''">
                           {{ getAdminUser( record.dialysis_order,"puncture_nurse")
                               ? getAdminUser( record.dialysis_order,"puncture_nurse") : ""
@@ -324,7 +324,7 @@
                       </td>
                       <td>{{ advice[0].delivery_way }}</td>
                       <td>{{ getTime(advice[0].execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-                      <td style="height:30px;line-height:30px">
+                      <td style="height:30px;line-height:30px">杨能华/
                         <span v-if="setAdminUserES(advice[0],'advice_doctor') == ''">
                           {{ getAdminUser(advice[0],'advice_doctor')}}
                         </span>
@@ -348,9 +348,7 @@
                             {{record.assessment_after_dislysis.actual_treatment_minute ? record.assessment_after_dislysis.actual_treatment_minute :'/'}}min
                           </div>
                           <div style="flex: 1;">透析器凝血:
-                            <div class="under_line" style=" width: 60%;text-align: center; white-space: normal;">
-                              {{ record.assessment_after_dislysis.cruor ? record.assessment_after_dislysis.cruor : "" }}
-                            </div>
+                            {{ record.assessment_after_dislysis.cruor ? record.assessment_after_dislysis.cruor : "" }}
                           </div>
                         </div>
                       </td>
@@ -367,7 +365,7 @@
                 <div style="display: flex;border: 1px solid black;padding: 5px;">
                   <div style="flex: 1;">
                     <div style="display: inline-block;margin-right: 120px;">
-                      <span style="display: inline-block;">医生签名:</span>
+                      <span style="display: inline-block;">医生签名:</span>杨能华/
                       <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">
                         {{ getAdminUser(record.prescription, 'prescription_doctor') }}
                       </span>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -781,7 +781,7 @@
                             {{
                               monitor.displacement_quantity
                                 ? monitor.displacement_quantity
-                                : "0"
+                                : ""
                             }}
                           </span>
                         </td>

src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue

@@ -173,7 +173,7 @@
                   穿刺点情况:{{ predialysis.point_puncture ? predialysis.point_puncture : "/" }}
                 </div>&nbsp;&nbsp;
                 <div style="display: 1;line-height: 30px;">
-                  穿刺护士:杨能华/
+                  穿刺护士:
                   <span style="display: inline-block;width: 100px;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
                     {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}
                   </span>
@@ -278,6 +278,7 @@
                 <td>{{ advice.delivery_way }}</td>
                 <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                 <td style="height:30px;line-height:30px">
+                  杨能华/
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                     {{ getAdminUser(advice.advice_doctor)}}
                   </span>
@@ -304,16 +305,8 @@
                       {{afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute :'/'}}min
                     </div>
                     <div style="flex: 1;">透析器凝血:
-                      <div
-                        class="under_line"
-                        style="
-                          width: 60%;
-                          text-align: center;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.cruor ? afterdialysis.cruor : "" }}
-                      </div>
+                      {{ afterdialysis.cruor ? afterdialysis.cruor : "" }}
+                      
                     </div>
                   </div>
                 </td>
@@ -329,7 +322,7 @@
           <div style="display: flex;border: 1px solid black;padding: 5px;">
             <div style="flex: 1;">
               <div style="display: inline-block;margin-right: 120px;">
-                <span style="display: inline-block;">医生签名:</span>
+                <span style="display: inline-block;">医生签名:</span>杨能华/
                 <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
                   {{ getAdminUser(prescription.creater)}}
                 </span>
@@ -540,7 +533,17 @@ export default {
       ){
         const obj = "上机前病情"
         checkDate.push(obj)
-      } if(this.predialysis.systolic_blood_pressure == '' &&
+      } if(this.predialysis.temperature ==''){
+        const obj0 = "体温"
+        checkDate.push(obj0)
+      } if(this.predialysis.pulse_frequency==''){
+        const obj1_1 = "脉搏"
+        checkDate.push(obj1_1)
+      } if(this.predialysis.breathing_rate==''){
+        const obj1_2 = "呼吸"
+        checkDate.push(obj1_2)
+      }
+      if(this.predialysis.systolic_blood_pressure == '' &&
         this.predialysis.diastolic_blood_pressure == ''
       ){
         const obj1 = "血压"
@@ -555,16 +558,22 @@ export default {
       } if(this.afterdialysis.actual_treatment_hour == ''){
         const obj4 = "治疗时间"
         checkDate.push(obj4)
-      } if(this.prescription.anticoagulant == ''){
+      } if (
+        this.prescription.dialyzer_perfusion_apparatus == '' 
+      ){
+        const obj18 = "透析(滤)器"
+        checkDate.push(obj18)
+      }
+      if(this.prescription.anticoagulant == ''){
         const obj5 = "抗凝剂未填"
         checkDate.push(obj5)
-      } if(this.prescription.anticoagulant_shouji == 0 && this.prescription.anticoagulant=='普通肝素'){
+      } if(this.prescription.anticoagulant_shouji == 0 && this.prescription.anticoagulant==2){
         const obj6 = "首剂"
         checkDate.push(obj6)
-      } if(this.prescription.anticoagulant_weichi == 0 && this.prescription.anticoagulant=='普通肝素'){
+      } if(this.prescription.anticoagulant_weichi == 0 && this.prescription.anticoagulant==2){
         const obj7 = "维持"
         checkDate.push(obj7)
-      } if(this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant=='普通肝素'){
+      } if(this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant==2){
         const obj8 = "总量"
         checkDate.push(obj8)
       }
@@ -572,16 +581,16 @@ export default {
         const obj9 = "上次透后体重"
         checkDate.push(obj9)
       } if(this.predialysis.weight_before == 0){
-        const obj10 = "本次透前体重"
+        const obj10 = "透前体重"
         checkDate.push(obj10)
       } if(this.predialysis.dry_weight == 0){
         const obj11 = "干体重"
         checkDate.push(obj11)
       } if(this.afterdialysis.weight_after == 0){
-        const obj12 = "本次透后体重"
+        const obj12 = "透后体重"
         checkDate.push(obj12)
-      } if(this.prescription.target_ultrafiltration == 0){
-        const obj13 = "目标脱水量"
+      } if(this.prescription.calcium == 0){
+        const obj13 = "透析液钙浓度"
         checkDate.push(obj13)
       } if(this.prescription.prescription_water == 0){
         const obj14 = "处方脱水量"
@@ -589,29 +598,26 @@ export default {
       } if(this.prescription.creater == ""){
         const obj15 = "医生签名"
         checkDate.push(obj15)
-      } if(this.prescription.dialysate_flow == ''){
+      } 
+      if(this.afterdialysis.actual_treatment_hour == '' && 
+          this.afterdialysis.actual_treatment_minute==''){
         const obj16 = "透析液流量"
         checkDate.push(obj16)
-      } if(this.prescription.blood_flow_volume == ''){
-        const obj17 = "血流量"
+      } if(this.afterdialysis.cruor == ''){
+        const obj17 = "透析器凝血"
         checkDate.push(obj17)
-      } if (this.predialysis.machine_type == '') {
-        const obj19 = "透析器"
+      } 
+      if (this.predialysis.point_puncture == '') {
+        const obj19 = "穿刺点情况"
         checkDate.push(obj19)
-      } if (
-        this.prescription.dialysis_irrigation == '' &&
-        this.prescription.dialysis_dialyszers == '' &&
-        this.prescription.dialysis_strainer == ''
-      ){
-        const obj18 = "透析(滤)器"
-        checkDate.push(obj18)
-      } if (this.predialysis.blood_access_part_opera_name == ''){
+      } 
+      if (this.predialysis.blood_access_part_opera_name == ''){
         const obj20 = "血管通路"
         checkDate.push(obj20)
       } if (this.dialysisOrder == null ||
         this.dialysisOrder.puncture_nurse == 0
       ) {
-        const obj21 = "穿刺者"
+        const obj21 = "穿刺护士"
         checkDate.push(obj21)
       } if(this.summary.dialysis_summary == ""){
         const obj22 = "透析小结"
@@ -620,21 +626,32 @@ export default {
         this.dialysisOrder == null ||
         this.dialysisOrder.start_nurse == 0
       ) {
-        const obj23 = "护士签名"
+        const obj23 = "责任护士"
         checkDate.push(obj23)
+      } if (this.dialysisOrder == null && this.check.creater == 0) {
+        const obj49='核对护士'
+        checkDate.push(obj49)
+      } else if (this.dialysisOrder != null && this.check.creater == 0) {
+        const obj49='核对护士'
+        checkDate.push(obj49)
+      } else if (this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0) {
+        const obj49='核对护士'
+        checkDate.push(obj49)
+      } else if (this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0) {
+        const obj49='核对护士'
+        checkDate.push(obj49)
       }
-
-     if(this.tableAdvice.length > 0){
-        let num = 0
+      if(this.tableAdvice.length > 0){
         this.tableAdvice.map(item => {
           if(item.id > 0 && (item.created_time || item.start_time)){
-            if(item.execution_staff ==0 || item.checker ==0){
-              const obj24 = '执行,核对'
+            if(item.execution_staff ==0 || item.advice_doctor ==0){
+              const obj24 = '执行,医生'
               checkDate.push(obj24)
             }
           }
         })
       }
+      
       this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function(val) {

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
           }

src/xt_pages/outpatientTool/components/personSettle.vue

@@ -46,32 +46,30 @@
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
     </div>
-    <el-table :data="tableData" border :row-style="{ color: '#303133' }"
+    <el-table ref="tables" :data="tableData" border :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-
               v-loading="settle_loading"
               max-height="600"
-              :summary-method="getTotal"
               highlight-current-row>
 
-      <el-table-column align="center" label="患者名字" fixed>
+      <el-table-column align="center" prop="name" label="患者名字" fixed>
         <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="item_name" label="身份证">
+      <el-table-column align="center" prop="id_card_no" label="身份证">
         <template slot-scope="scope">
           {{scope.row.id_card_no}}
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center"  label="透析次数">
+      <el-table-column align="center" prop="dis"   label="透析次数">
         <template slot-scope="scope">
           {{scope.row.dis.length}}
 
         </template>
       </el-table-column>
 
-      <el-table-column align="center"  label="结算次数">
+      <el-table-column align="center" prop="s_count"  label="结算次数">
         <template slot-scope="scope">
           {{scope.row.orders.length}}
         </template>
@@ -458,7 +456,7 @@ export default {
       })
       this.sameRowArr = sameRowArr
     }, merge({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0 || columnIndex === 1) {
+      if (columnIndex === 0) {
         const _row = this.tempArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
         return {
@@ -467,133 +465,27 @@ export default {
         }
       }
     },
-    getTotal(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-          return
-        }
-        const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'total' || column.property === 'medfee_sumamt'  || column.property === 'fund_pay_sumamt'  ||
-          column.property === 'acct_pay'  || column.property === 'maf_pay'  || column.property === 'psn_cash_pay'  ||
-          column.property === 'hifp_pay'  || column.property === 'hifob_pay' ||  column.property === 'hifes_pay' ||
-          column.property === 'hifmi_pay' || column.property === 'oth_pay' || column.property === 'cvlserv_pay' ||
-          column.property === 'wechat_pay' || column.property === 'ali_pay' || column.property === 'band_card_pay' ||
-          column.property === 'jifen_pay' || column.property === 'cash_pay' || column.property ==='card_desc'
-        ) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] = sums[index].toFixed(2)
-        } else {
-          sums[index] = ''
-        }
-      })
-
-      return sums
-    },
-    export_detail() {
+  export_detail() {
 
       let list = []
-      // for (let i = 0; i < this.tableData.length; i++) {
-      //   let order = this.tableData[i]
-      //   let name = order.other_name
-      //   let id_card_no = order.id_card_no
-      //
-      //   let time = ''
-      //   let balance_accounts = ""
-      //   let med_type = ""
-      //   let medfee_sumamt = ""
-      //   let fund_pay_sumamt = ""
-      //   let acct_pay = ""
-      //   let psn_cash_pay = ""
-      //   let hifes_pay = ""
-      //   let hifmi_pay = ""
-      //   let hifp_pay = ""
-      //   let hifob_pay = ""
-      //   let maf_pay = ""
-      //   let time2 = ""
-      //   time2 = this.getTimes(order.settle_accounts_date)
-      //
-      //   let total = ""
-      //
-      //   if(order.setl_time.length == 0){
-      //
-      //     time = this.getTimes(order.settle_accounts_date)
-      //
-      //   }else {
-      //
-      //     time = order.setl_time.split(" ")[0]
-      //
-      //   }
-      //
-      //   if (order.is_medicine_insurance == 0) {
-      //     balance_accounts = '自费'
-      //   }
-      //
-      //   if (order.is_medicine_insurance == 1) {
-      //     balance_accounts = '医保'
-      //   }
-      //
-      //   if (order.med_type == '14') {
-      //     med_type = '门诊特殊病'
-      //   }
-      //
-      //   if (order.med_type == '11') {
-      //     med_type = '普通门诊'
-      //   }
-      //
-      //   medfee_sumamt = order.medfee_sumamt
-      //   fund_pay_sumamt = order.fund_pay_sumamt
-      //
-      //   acct_pay = order.acct_pay
-      //
-      //   psn_cash_pay = order.psn_cash_pay
-      //   hifes_pay = order.hifes_pay
-      //   hifmi_pay = order.hifmi_pay
-      //   hifp_pay = order.hifp_pay
-      //   hifob_pay = order.hifob_pay
-      //   maf_pay = order.maf_pay
-      //   total = order.total
-      //
-      //
-      //   let obj = {
-      //     '患者姓名': name,
-      //     '身份证': id_card_no,
-      //     '治疗日期': time2,
-      //     '结算日期': time,
-      //     '结算类型': balance_accounts,
-      //     '处方类型': med_type,
-      //     '医疗费总额': medfee_sumamt,
-      //     '基金支付金额': fund_pay_sumamt,
-      //     '基金统筹金额': hifp_pay,
-      //     '大额基金支付':hifob_pay,
-      //     '医疗救助基金':maf_pay,
-      //     '个人账户支付金额': acct_pay,
-      //     '个人支付基金': psn_cash_pay,
-      //     '企业补充医疗保险基金支出': hifes_pay,
-      //     '居民大病保险资金支出': hifmi_pay,
-      //     '费用总额':total,
-      //
-      //   }
-      //   list.push(obj)
-      // }
+      for (let i = 0; i < this.tableData.length; i++) {
+        let order = this.tableData[i]
+        let name = order.name
+
+        let obj = {
+          '患者姓名': name,
+        }
+        list.push(obj)
+      }
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = [ '患者姓名','身份证', '治疗日期','结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出', '费用总额']
-        const filterVal = [ '患者姓名','身份证', '治疗日期','结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出',  '费用总额']
+        const tHeader = [ '患者姓名']
+        const filterVal = [ '患者姓名']
         const data = this.formatJson(filterVal, list)
         excel.export_json_to_excel1({
           header: tHeader,
           data,
-          filename: '结算明细',
-          ref:this.$refs['report-table'].$el
+          filename: '汇总',
+          ref:this.$refs['tables'].$el
         })
       })
 

src/xt_pages/outpatientTool/components/settle.vue

@@ -333,8 +333,6 @@ import { uParseTime } from '@/utils/tools'
         items: [
           { id: 1, name: '医保' },
           { id: 2, name: '自费' },
-          { id: 3, name: '门诊特殊病' },
-          { id: 4, name: '普通门诊' },
           { id: 5, name: '城乡居民基本医疗保险' },
           { id: 6, name: '职工基本医疗保险' }
 
@@ -673,203 +671,211 @@ import { uParseTime } from '@/utils/tools'
                 this.tableData_three.push(order)
               }
             }
-          }
-        })
-
-
 
+            let list = []
+            for (let i = 0; i < this.tableData_three.length; i++) {
+              let order = this.tableData_three[i]
+              let name = order.other_name
+              let id_card_no = order.id_card_no
+              let m_id = order.mdtrt_id
+              let setl_date = order.setl_time.split(" ")[0]
+              let setl_time = order.setl_time
+              let sick_name =this.getSickName(order.his.sick_type)
+              let cbd = this.getName(order.his.insuplc_admdvs) + "(" + order.his.insuplc_admdvs + ")"
+              let settle_type = ""
+              if(order.is_medicine_insurance == 0){
+                settle_type = "自费"
+              }else{
+                settle_type = this.getTypeName(order)
+              }
 
-        let list = []
-        for (let i = 0; i < this.tableData_three.length; i++) {
-          let order = this.tableData_three[i]
-          let name = order.other_name
-          let id_card_no = order.id_card_no
-          let m_id = order.mdtrt_id
-          let setl_date = order.setl_time.split(" ")[0]
-          let setl_time = order.setl_time
-          let sick_name =this.getSickName(order.his.sick_type)
-          let cbd = this.getName(order.his.insuplc_admdvs) + "(" + order.his.insuplc_admdvs + ")"
-          let settle_type = ""
-          if(order.is_medicine_insurance == 0){
-             settle_type = "自费"
-          }else{
-            settle_type = this.getTypeName(order)
-          }
+              let med_name = ""
+              switch (order.med_type){
+                case "14":
+                  med_name = "门诊特殊病"
+                  break
+                case "11":
+                  med_name = "普通门诊"
+
+                  break
+                case "1112":
+                  med_name = "普通门诊"
+
+                  break
+                case "140104":
+                  med_name = "城乡门诊特殊病(140104)"
+
+                  break
+                case "140201":
+                  med_name = "门诊特病(140201)"
+
+                  break
+                case "992102":
+                  med_name = "单病种(992102)"
+                  break
+              }
 
-          let med_name = ""
-          switch (order.med_type){
-            case "14":
-              med_name = "门诊特殊病"
-              break
-            case "11":
-              med_name = "普通门诊"
+              let mode_name = ""
+              if(order.sch.id == 0){
+                mode_name = "未排班"
+              }else{
+                mode_name = this.modeOptions[order.sch.mode_id].name
+              }
 
-              break
-            case "1112":
-              med_name = "普通门诊"
 
-              break
-            case "140104":
-              med_name = "城乡门诊特殊病(140104)"
 
-              break
-            case "140201":
-              med_name = "门诊特病(140201)"
+              let balance_accounts = ""
+              let med_type = ""
+              let medfee_sumamt = ""
+              let fund_pay_sumamt = ""
+              let acct_pay = ""
+              let psn_cash_pay = ""
+              let hifes_pay = ""
+              let hifmi_pay = ""
+              let hifp_pay = ""
+              let hifob_pay = ""
+              let maf_pay = ""
+              let time2 = ""
+              time2 = this.getTimes(order.settle_accounts_date)
 
-              break
-            case "992102":
-              med_name = "单病种(992102)"
-              break
-          }
 
-          let mode_name = ""
-          if(order.sch.id == 0){
-            mode_name = "未排班"
-          }else{
-            mode_name = this.modeOptions[order.sch.mode_id].name
-          }
+              medfee_sumamt = order.medfee_sumamt
+              fund_pay_sumamt = order.fund_pay_sumamt
+              acct_pay = order.acct_pay
+              psn_cash_pay = order.psn_cash_pay
 
+              console.log( order.psn_cash_pay)
 
+              console.log(psn_cash_pay)
 
-          let balance_accounts = ""
-          let med_type = ""
-          let medfee_sumamt = ""
-          let fund_pay_sumamt = ""
-          let acct_pay = ""
-          let psn_cash_pay = ""
-          let hifes_pay = ""
-          let hifmi_pay = ""
-          let hifp_pay = ""
-          let hifob_pay = ""
-          let maf_pay = ""
-          let time2 = ""
-          time2 = this.getTimes(order.settle_accounts_date)
+              hifp_pay = order.hifp_pay
+              hifob_pay = order.hifob_pay
 
+              let preselfpay_amt;
+              preselfpay_amt = order.preselfpay_amt
 
-          medfee_sumamt = order.medfee_sumamt
-          fund_pay_sumamt = order.fund_pay_sumamt
-          acct_pay = order.acct_pay
-          psn_cash_pay = order.psn_cash_pay
-          hifp_pay = order.hifp_pay
-          hifob_pay = order.hifob_pay
 
-          let preselfpay_amt;
-          preselfpay_amt = order.preselfpay_amt
+              let overlmt_self_pay;
+              overlmt_self_pay = order.overlmt_self_pay
 
+              let fulamt_ownpay_amt;
+              fulamt_ownpay_amt = order.fulamt_ownpay_amt
 
-          let overlmt_self_pay;
-          overlmt_self_pay = order.overlmt_self_pay
 
-          let fulamt_ownpay_amt;
-          fulamt_ownpay_amt = order.fulamt_ownpay_amt
+              let inscp_scp_amt;
+              inscp_scp_amt = order.inscp_scp_amt
 
 
-          let inscp_scp_amt;
-          inscp_scp_amt = order.inscp_scp_amt
 
+              maf_pay = order.maf_pay
 
 
-          maf_pay = order.maf_pay
+              hifes_pay = order.hifes_pay
+              hifmi_pay = order.hifmi_pay
 
 
-          hifes_pay = order.hifes_pay
-          hifmi_pay = order.hifmi_pay
+              let oth_pay;
+              oth_pay = order.oth_pay
 
 
-          let oth_pay;
-          oth_pay = order.oth_pay
+              let cvlserv_pay;
+              cvlserv_pay = order.cvlserv_pay
 
 
-          let cvlserv_pay;
-          cvlserv_pay = order.cvlserv_pay
 
+              let fa_piao_code;
+              fa_piao_code = order.fa_piao_code
 
 
-          let fa_piao_code;
-          fa_piao_code = order.fa_piao_code
+              let fa_piao_number;
+              fa_piao_number = order.fa_piao_number
 
+              let ali_pay;
+              ali_pay = order.ali_pay
 
-          let fa_piao_number;
-          fa_piao_number = order.fa_piao_number
 
-          let ali_pay;
-          ali_pay = order.ali_pay
+              let band_card_pay;
+              band_card_pay = order.band_card_pay
 
 
-          let band_card_pay;
-          band_card_pay = order.band_card_pay
+              let jifen_pay;
+              jifen_pay = order.jifen_pay
 
+              let wechat_pay;
+              wechat_pay = order.wechat_pay
 
-          let jifen_pay;
-          jifen_pay = order.jifen_pay
 
-          let wechat_pay;
-          wechat_pay = order.wechat_pay
+              let cash_pay;
+              cash_pay = order.cash_pay
 
 
-          let cash_pay;
-          cash_pay = order.cash_pay
+              let card_desc;
+              card_desc = order.card_desc
 
 
-          let card_desc;
-          card_desc = order.card_desc
+              let oth_desc;
+              oth_desc = order.oth_desc
 
 
-          let oth_desc;
-          oth_desc = order.oth_desc
+              let obj = {
+                '患者姓名': name,
+                '身份证': id_card_no,
+                "就诊号": m_id,
+                '治疗日期': time2,
+                "结算日期": setl_date,
+                '结算时间': setl_time,
+                "病种名称":sick_name,
+                "参保地":cbd,
+                '结算类型': settle_type,
+                '处方类型':  med_name,
+                // "透析模式": mode_name,
+                '医疗费总额': medfee_sumamt,
+                '基金支付金额': fund_pay_sumamt,
+                '个人账户支付金额': acct_pay,
+                '个人支付金额': psn_cash_pay,
+                '基金统筹金额': hifp_pay,
+                '大额基金支付':hifob_pay,
+                '先行自付金额': preselfpay_amt,
+                '超限价金额': overlmt_self_pay,
+                '全自费金额': fulamt_ownpay_amt,
+                '符合政策范围金额': inscp_scp_amt,
+                '医疗救助基金':maf_pay,
+                '企业补充医疗保险基金支出': hifes_pay,
+                '居民大病保险资金支出': hifmi_pay,
+                '其他支付': oth_pay,
+                '公务员医疗补助资金支出': cvlserv_pay,
+                '发票号码': fa_piao_number,
+                '发票编号': fa_piao_code,
+                '微信支付': wechat_pay,
+                '支付宝支付': ali_pay,
+                '银行卡支付': band_card_pay,
+                '积分支付': jifen_pay,
+                '现金支付': cash_pay,
+                '储值卡说明': card_desc,
+                '其他说明': oth_desc,
+              }
+              list.push(obj)
+            }
 
+            if(list.length > 0){
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = ['患者姓名', '身份证', "就诊号", '治疗日期', '结算日期', "结算时间", "病种名称", "参保地", '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付金额', "基金统筹金额", "大额基金支付", "先行自付金额", "超限价金额", "全自费金额", "符合政策范围金额", "医疗救助基金", '企业补充医疗保险基金支出', '居民大病保险资金支出', "其他支付", "公务员医疗补助资金支出", "发票号码", "发票编号", "微信支付", "支付宝支付", "银行卡支付", "积分支付", "现金支付", "储值卡说明", '其他说明']
+                const filterVal = ['患者姓名', '身份证', "就诊号", '治疗日期', '结算日期', "结算时间", "病种名称", "参保地", '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付金额', "基金统筹金额", "大额基金支付", "先行自付金额", "超限价金额", "全自费金额", "符合政策范围金额", "医疗救助基金", '企业补充医疗保险基金支出', '居民大病保险资金支出', "其他支付", "公务员医疗补助资金支出", "发票号码", "发票编号", "微信支付", "支付宝支付", "银行卡支付", "积分支付", "现金支付", "储值卡说明", '其他说明']
+
+                const data = this.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename: '结算明细'
+                })
+              })
+            }
 
-          let obj = {
-            '患者姓名': name,
-            '身份证': id_card_no,
-            "就诊号": m_id,
-            '治疗日期': time2,
-            "结算日期": setl_date,
-            '结算时间': setl_time,
-            "病种名称":sick_name,
-            "参保地":cbd,
-            '结算类型': settle_type,
-            '处方类型':  med_name,
-            // "透析模式": mode_name,
-            '医疗费总额': medfee_sumamt,
-            '基金支付金额': fund_pay_sumamt,
-            '个人账户支付金额': acct_pay,
-            '个人支付金额': psn_cash_pay,
-            '基金统筹金额': hifp_pay,
-            '大额基金支付':hifob_pay,
-            '先行自付金额': preselfpay_amt,
-            '超限价金额': overlmt_self_pay,
-            '全自费金额': fulamt_ownpay_amt,
-            '符合政策范围金额': inscp_scp_amt,
-            '医疗救助基金':maf_pay,
-            '企业补充医疗保险基金支出': hifes_pay,
-            '居民大病保险资金支出': hifmi_pay,
-            '其他支付': oth_pay,
-            '公务员医疗补助资金支出': cvlserv_pay,
-            '发票号码': fa_piao_number,
-            '发票编号': fa_piao_code,
-            '微信支付': wechat_pay,
-            '支付宝支付': ali_pay,
-            '银行卡支付': band_card_pay,
-            '积分支付': jifen_pay,
-            '现金支付': cash_pay,
-            '储值卡说明': card_desc,
-            '其他说明': oth_desc,
           }
-          list.push(obj)
-        }
-        import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = [ '患者姓名','身份证',"就诊号", '治疗日期','结算日期',"结算时间",  "病种名称", "参保地",'结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金',"基金统筹金额","大额基金支付", "先行自付金额","超限价金额","全自费金额","符合政策范围金额","医疗救助基金",'企业补充医疗保险基金支出','居民大病保险资金支出',"其他支付", "公务员医疗补助资金支出","发票号码","发票编号","微信支付", "支付宝支付","银行卡支付","积分支付","现金支付","储值卡说明",'其他说明']
-          const filterVal = [ '患者姓名','身份证',"就诊号", '治疗日期','结算日期', "结算时间", "病种名称","参保地",'结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金',"基金统筹金额","大额基金支付","先行自付金额","超限价金额","全自费金额","符合政策范围金额","医疗救助基金",'企业补充医疗保险基金支出','居民大病保险资金支出',"其他支付", "公务员医疗补助资金支出","发票号码", "发票编号","微信支付","支付宝支付","银行卡支付","积分支付","现金支付","储值卡说明",'其他说明']
-
-          const data = this.formatJson(filterVal, list)
-          excel.export_json_to_excel({
-            header: tHeader,
-            data,
-            filename: '结算明细'
-          })
         })
 
+
+
       }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       }

src/xt_pages/outpatientTool/labelPrint.vue

@@ -128,18 +128,18 @@
                     </el-col>
                 </el-row>
                   <div id="sign" class="signPrint">
-                      <div style="display:flex;margin-bottom:10px;">
+                      <div style="display:flex;margin-bottom:0px;">
                           <div style="margin-left:15px;">
                               <div style="font-weight:bold;font-size:24px;">C</div>
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img  v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
+                          <img style="height: 85px;" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
                       </div>
-                      <div style="margin-bottom:5px;">{{current_number}}</div>
+                      <div style="margin-bottom:0px;">{{current_number}}</div>
                       <div style="display:flex;">
-                          <div style="font-size:24px;padding-left:20px;">{{current_project_name}}</div>
-                          <div style="font-size:24px;margin-left:20px;">{{current_name}}</div>
+                          <div style="font-size:15px;padding-left:20px;">{{current_project_name}}</div>
+                          <div style="font-size:15px;margin-left:20px;">{{current_name}}</div>
                       </div>
                   </div>
             </div>
@@ -360,10 +360,7 @@
                   }
                 }else{
                   this.current_params.is_team = 0
-
                 }
-
-
                 if(!this.isShow){
                   createPrintLable(this.current_params).then(response => {
                     if (response.data.state == 0) {
@@ -480,8 +477,11 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log('vvvvvv',response.data.data);
             this.labelVisible = true
             if(response.data.data.labels.id > 0){
+              console.log('内容1');
+              
               this.current_ctime = row.ctime
               this.current_number = row.number
               this.current_project_name = row.project_name
@@ -491,8 +491,10 @@
                   format: 'CODE39',
                   lineColor: '#000',
                   background: '#EBEEF5',
-                  width: 3,
-                  height: 200,
+                  // width: 3,
+                  // height: 200,
+                  width: 1,
+                  height: 90,
                   displayValue: false,
                   fontOptions:"bold italic",//使文字加粗体或变斜体
                   font:"fantasy",//设置文本的字体
@@ -500,11 +502,13 @@
                   textPosition:"top",//设置文本的垂直位置
                   textMargin:5,//设置条形码和文本之间的间距
                   fontSize:15,//设置文本的大小
-                  margin:15//设置条形码周围的空白边距
+                  margin:0,//设置条形码周围的空白边距
+                  marginTop:0
                 })
               });
 
             }else{
+              console.log('内容2');
               let params = {
                 is_combination_print:this.is_combination_print,
                 patient_id: row.patient_id,