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

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -306,7 +306,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -317,7 +317,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -694,12 +694,12 @@
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)">
+          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)">
             <el-form-item label="置换量(L)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)">
+          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)">
             <el-form-item label="置换量(ml)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -22,8 +22,8 @@
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29" width="92px" > 置换率(L/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -51,7 +51,7 @@
             {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
           </div>
         </div>
-        
+
         <div class="inline_block">
           透析次数：
           <div class="under_line" style="width: 50px;text-align: left">
@@ -73,7 +73,7 @@
             {{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}
           </div>
         </div>
-        
+
       </div> -->
 
       <div class="row">
@@ -570,7 +570,7 @@
                         <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
                         <img style="height:30px" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
                       </td>
-                      
+
                       <td height="30px" style="padding:4px 5px;">
                         <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                       </td>
@@ -588,7 +588,7 @@
                 </table>
               </td>
             </tr>
-            
+
             <tr>
               <td style="padding: 0; position: relative;" colspan="2">
                 <table class="inside_table">
@@ -637,7 +637,7 @@
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                             <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】引血100ml/min</template>
-                            <span v-if="dialysisOrder && monitor.operate_time == dialysisOrder.end_time">{{ monitor.end }}</span> 
+                            <span v-if="dialysisOrder && monitor.operate_time == dialysisOrder.end_time">{{ monitor.end }}</span>
                             {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
                         </div>
@@ -1059,7 +1059,7 @@ export default {
         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
-        console.log("透前评估",this.predialysis)
+        // console.log("透前评估",this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

@@ -233,7 +233,7 @@
               </div>
               <div class="actionBar">
                   <div>收费员：{{balanceAccounts.current_admin.user_name}}</div>
-                  <div>日期：{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</div>
+                  <div>日期：{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
               </div>
           </div>
 
@@ -421,7 +421,7 @@
               }
           }
         }
-        
+
       },
       getTime(value, temp) {
         if (value != undefined) {

src/xt_pages/outpatientTool/components/detail.vue

@@ -1,13 +1,445 @@
 <template>
+    <div class="main-contain outpatientChargesManagement">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+                    <!--@click="Action">-->
+                    <!--导出-->
+                    <!--</el-button>-->
+                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                              @keyup.enter.native='searchAction'
+                              class="filter-item"/>
+                    <el-select size="small" v-model="item_type" placeholder="请选择"
+                               style="width:150px;margin-left:10px;" @change="changeItem">
+                        <el-option
+                                label="全部"
+                                value="0">
+                        </el-option>
+                        <el-option
+                                v-for="item,index in items"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
+                    <el-date-picker
+                            v-model="chargeDate"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            @change="changeDate"
+                            end-placeholder="结束日期">
+                    </el-date-picker>
+                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+                </div>
+                <div>
+                    <!-- <el-popover
+                      placement="bottom"
+                      width="210"
+                      trigger="click">
+                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
+                    </el-popover> -->
+                    <!--<el-button size="small" type="primary" @click="export_detail">报表下载</el-button>-->
+                </div>
+            </div>
+            <el-table :data="tableData" border :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      :span-method="merge"
+                      highlight-current-row>
 
+                <el-table-column align="center" prop="name" label="患者名字">
+                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                </el-table-column>
+                <!--<el-table-column align="center" prop="name" label="患者类型">-->
+                <!--<template slot-scope="scope"></template>-->
+                <!--</el-table-column>-->
+
+                <el-table-column align="center" prop="name" label="项目名称">
+                    <template slot-scope="scope">{{scope.row.item_name}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="数量">
+                    <template slot-scope="scope">{{scope.row.count}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="单价">
+                    <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="费用">
+                    <template slot-scope="scope">
+                        <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+                    </template>
+                </el-table-column>
+
+                <el-table-column align="center" prop="name" label="费用总额">
+                    <template slot-scope="scope">
+                        <div>{{scope.row.total.toFixed(2)}}</div>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+        </div>
+
+    </div>
 </template>
+
+
 <script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { GetSummaryDetail } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  // import NewStatementPrint from './newStatementPrint'
+  const moment = require('moment')
   export default {
-    name: 'summaryDetail'
-  }
-</script>
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        tempArr: [],
+        sameRowArr: [],
+        keywords: '',
+        tableData: [],
+        chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+        item_type: '0',
+        items: [
+          { id: 1, name: '药品' },
+          { id: 2, name: '项目' },
+          { id: 3, name: '耗材' },
+
+        ]
+
+      }
+    },
+    methods: {
+      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
+      },
+      unique(arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+      },
+      changeDate() {
+        this.getSummaryDetailList()
+      },
+      changeItem() {
+        this.getSummaryDetailList()
+      },
+      searchAction() {
+        this.item_type = '0'
+        this.getSummaryDetailList()
+
+      },
+      getSummaryDetailList() {
+        let start_time = this.chargeDate[0]
+        let end_time = this.chargeDate[1]
+        let params = {
+          start_time: start_time,
+          end_time: end_time,
+          type: this.item_type,
+          keyword: this.keywords
+        }
+        GetSummaryDetail(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = []
+            let tempPatients = []
+            let tempPatientsTwo = []
+
+            let tempData = response.data.data.patients
+            let data = response.data.data.patients
+            let orders = this.unique(tempData)
+            for (let i = 0; i < orders.length; i++) {
+              let obj = {
+                patient_id: orders[i].id,
+                name: orders[i].name,
+                orders: []
+              }
+              for (let b = 0; b < data.length; b++) {
+                if (orders[i].id == data[b].id) {
+                  obj.orders = obj.orders.concat(data[b].orders)
+                }
+              }
+              tempPatients.push(obj)
+            }
+
+            for (let i = 0; i < tempPatients.length; i++) {
+              let obj = {
+                patient_id: tempPatients[i].patient_id,
+                name: tempPatients[i].name,
+                order_info: []
+              }
+              let orders = tempPatients[i].orders
+              for (let b = 0; b < orders.length; b++) {
+                for (let c = 0; c < orders[b].order_info.length; c++) {
+                  let newObj = {}
+
+                  newObj['count'] = orders[b].order_info[c].cnt
+                  newObj['price'] = orders[b].order_info[c].pric
+                  if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
+                    newObj['type'] = 1
+                    newObj['item_name'] = orders[b].order_info[c].advice.advice_name
+                    newObj['item_id'] = orders[b].order_info[c].advice.drug_id
+
+                  }
+                  if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
+                    newObj['type'] = 2
+                    newObj['item_id'] = orders[b].order_info[c].project.project_id
 
-<style scoped>
+                    if (orders[b].order_info[c].project.type == 2) {
+                      newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+                    } else if (orders[b].order_info[c].project.type == 3) {
+                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + "（ "+ orders[b].order_info[c].project.good_info.specification_name+" ）"
+                    }
+                  }
+                  obj.order_info.push(newObj)
+                }
+              }
+              tempPatientsTwo.push(obj)
+            }
+            console.log(tempPatientsTwo)
 
-</style>
+            for (let d = 0; d < tempPatientsTwo.length; d++) {
+              tempPatientsTwo[d]['new_order_info'] = []
+              let project = []
+              let advice = []
+              for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
+                if (tempPatientsTwo[d].order_info[b].type == 1) {
+                  advice.push(tempPatientsTwo[d].order_info[b])
+                } else {
+                  project.push(tempPatientsTwo[d].order_info[b])
+                }
+              }
+              project = this.uniqueProjectAndAdvice(project)
+              advice = this.uniqueProjectAndAdvice(advice)
+
+              for (let i = 0; i < project.length; i++) {
+                let obj = {}
+                let count = 0
+                for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+                  if (project[i].item_id == tempPatientsTwo[d].order_info[a].item_id && project[i].price == tempPatientsTwo[d].order_info[a].price) {
+                    count = count + tempPatientsTwo[d].order_info[a].count
+                  }
+                }
+                obj['price'] = project[i].price
+                obj['type'] = project[i].type
+                obj['item_name'] = project[i].item_name
+                obj['item_id'] = project[i].item_id
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                obj['count'] = count
+                tempPatientsTwo[d].new_order_info.push(obj)
+              }
+
+              for (let i = 0; i < advice.length; i++) {
+                let obj = {}
+                let count = 0
+                for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+                  if (advice[i].item_id == tempPatientsTwo[d].order_info[a].item_id && advice[i].price == tempPatientsTwo[d].order_info[a].price) {
+                    count = count + tempPatientsTwo[d].order_info[a].count
+                  }
+                }
+                obj['price'] = advice[i].price
+                obj['type'] = advice[i].type
+                obj['item_name'] = advice[i].item_name
+                obj['item_id'] = advice[i].item_id
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                obj['count'] = count
+                tempPatientsTwo[d].new_order_info.push(obj)
+              }
+
+            }
+
+            for (let i = 0; i < tempPatientsTwo.length; i++) {
+              let total = 0
+              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+                if (tempPatientsTwo[i].new_order_info[b].item_name.length != 0) {
+                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
+                }
+              }
+              tempPatientsTwo[i]['total'] = total
+            }
+
+            for (let i = 0; i < tempPatientsTwo.length; i++) {
+              console.log(tempPatientsTwo[i].total)
+              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+                if (tempPatientsTwo[i].new_order_info[b].item_name.length != 0) {
+                  let obj = {
+                    name: tempPatientsTwo[i].name,
+                    patient_id: tempPatientsTwo[i].patient_id,
+                    price: tempPatientsTwo[i].new_order_info[b].price,
+                    type: tempPatientsTwo[i].new_order_info[b].type,
+                    item_name: tempPatientsTwo[i].new_order_info[b].item_name,
+                    item_id: tempPatientsTwo[i].new_order_info[b].item_id,
+                    count: tempPatientsTwo[i].new_order_info[b].count,
+                    total: tempPatientsTwo[i].total
+                  }
+                  this.tableData.push(obj)
+                }
+
+              }
+            }
+            this.handleSpanTempArr()
+            // this.tableData = tempPatientsTwo
+
+            // console.log(tempPatientsTwo.length)
+            //
+
+          }
+          //
+          // console.log('去重前')
+          // console.log(advice)
+          // console.log(project)
+          // //
+          // //
+
+          // //
+          // console.log('去重后')
+          //
+          // console.log(advice.length)
+          // console.log(project.length)
+          //
+          // for (let i = 0; i < project.length; i++) {
+          //   let obj = {}
+          //   let count = 0
+          //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+          //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+          //       count = count + tempPatientsTwo[a].count
+          //       obj['count'] = count
+          //
+          //     }
+          //     obj['price'] = project[i].price
+          //     obj['type'] = project[i].type
+          //     obj['item_name'] = project[i].item_name
+          //     obj['item_id'] = project[i].item_id
+          //     obj['name'] = project[i].name
+          //     obj['patient_id'] = project[i].patient_id
+          //     obj['count'] = count
+          //     this.tableData.push(obj)
+          //   }
+          // }
+          //
+          //
+          // for (let i = 0; i < advice.length; i++) {
+          //   let obj = {}
+          //   let count = 0
+          //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+          //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+          //       count = count + tempPatientsTwo[a].count
+          //       obj['count'] = count
+          //
+          //     }
+          //     obj['price'] = advice[i].price
+          //     obj['type'] = advice[i].type
+          //     obj['item_name'] = advice[i].item_name
+          //     obj['item_id'] = advice[i].item_id
+          //     obj['name'] = advice[i].name
+          //     obj['patient_id'] = advice[i].patient_id
+          //     this.tableData.push(obj)
+          //   }
+          // }
+          // console.log(this.tableData.length)
+          // this.tableData = this.sort(this.tableData)
+
+        })
+      }, uniqueProjectAndAdvice(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      }, sort(arr) {
+        for (var i = 0; i < arr.length - 1; i++) {
+          for (var j = 0; j < arr.length - i - 1; j++) {
+            if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
+              var hand = arr[j]
+              arr[j] = arr[j + 1]
+              arr[j + 1] = hand
+
+            }
+          }
+        }
+        return arr
+      }, handleSpanTempArr() {
+        this.tempArr = []
+
+        for (let i = 0; i < this.tableData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.tableData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.patient_id === this.tableData[index - 1].patient_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+      }, merge({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0 || columnIndex === 5) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      }
+    },
+    created() {
+      this.getSummaryDetailList()
+
+    }
+  }
+</script>

src/xt_pages/outpatientTool/components/gather.vue

@@ -1,13 +1,478 @@
 <template>
+    <div class="main-contain outpatientChargesManagement">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+                    <!--@click="Action">-->
+                    <!--导出-->
+                    <!--</el-button>-->
+                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                              @keyup.enter.native='searchAction'
+                              class="filter-item"/>
+                    <el-select size="small" v-model="item_type" placeholder="请选择"
+                               style="width:150px;margin-left:10px;" @change="changeItem">
+                        <el-option
+                                label="全部"
+                                value="0">
+                        </el-option>
+                        <el-option
+                                v-for="item,index in items"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
+                    <el-date-picker
+                            v-model="chargeDate"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            @change="changeDate"
+                            end-placeholder="结束日期">
+                    </el-date-picker>
+                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+                </div>
+                <div>
+                    <!-- <el-popover
+                      placement="bottom"
+                      width="210"
+                      trigger="click">
+                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
+                    </el-popover> -->
+                    <!--<el-button size="small" type="primary" @click="export_detail">报表下载</el-button>-->
+                </div>
+            </div>
+            <el-table :data="tableData" border :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      show-summary
+                      max-height="600"
+                      :span-method="merge"
+                      :summary-method="getTotal"
+                      highlight-current-row>
+
+                <el-table-column align="center" prop="name" label="患者名字">
+                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                </el-table-column>
+                <!--<el-table-column align="center" prop="name" label="患者类型">-->
+                <!--<template slot-scope="scope"></template>-->
+                <!--</el-table-column>-->
+
+                <el-table-column align="center" prop="item_name" label="项目类别">
+                    <template slot-scope="scope">{{scope.row.item_name}}</template>
+                </el-table-column>
+                <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>
+
+    </div>
 </template>
 
+
 <script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { GetSummaryDetail } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  // import NewStatementPrint from './newStatementPrint'
+  const moment = require('moment')
   export default {
-    name: 'gather'
-  }
-</script>
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [],
+        tempArr: [],
+        sameRowArr: [],
+        keywords: '',
+
+        tableData: [],
+        chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+        item_type: '0',
+        items: [
+          { id: 1, name: '药品' },
+          { id: 2, name: '项目' },
+          { id: 3, name: '耗材' },
+
+        ]
+
+      }
+    },
+    methods: {
+
+      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
+      },
+      unique(arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+      },
+      changeDate() {
+        // console.log(this.chargeDate)
+        this.getSummaryDetailList()
+      },
+      changeItem() {
+        this.getSummaryDetailList()
+      },
+      searchAction() {
+        this.item_type = '0'
+        this.getSummaryDetailList()
+      },
+      getSummaryDetailList() {
+        let start_time = this.chargeDate[0]
+        let end_time = this.chargeDate[1]
+        let params = {
+          start_time: start_time,
+          end_time: end_time,
+          type: this.item_type,
+          keyword: this.keywords
+        }
+        GetSummaryDetail(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            let tempPatients = []
+            let tempPatientsTwo = []
+            this.tableData = []
+            let tempData = response.data.data.patients
+            let data = response.data.data.patients
+            let orders = this.unique(tempData)
+            for (let i = 0; i < orders.length; i++) {
+              let obj = {
+                patient_id: orders[i].id,
+                name: orders[i].name,
+                orders: []
+              }
+              for (let b = 0; b < data.length; b++) {
+                if (orders[i].id == data[b].id) {
+                  obj.orders = obj.orders.concat(data[b].orders)
+                }
+              }
+              tempPatients.push(obj)
+            }
+
+            for (let i = 0; i < tempPatients.length; i++) {
+              let obj = {
+                patient_id: tempPatients[i].patient_id,
+                name: tempPatients[i].name,
+                order_info: []
+              }
+              let orders = tempPatients[i].orders
+              for (let b = 0; b < orders.length; b++) {
+                for (let c = 0; c < orders[b].order_info.length; c++) {
+                  let newObj = {}
+
+                  newObj['count'] = orders[b].order_info[c].cnt
+                  newObj['price'] = orders[b].order_info[c].pric
+                  if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
+                    newObj['type'] = 1
+                    newObj['item_name'] = orders[b].order_info[c].advice.advice_name
+                    newObj['item_id'] = orders[b].order_info[c].advice.drug_id
+
+                  }
+                  if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
+                    newObj['item_id'] = orders[b].order_info[c].project.project_id
+                    if (orders[b].order_info[c].project.type == 2) {
+                      newObj['type'] = 2
+                      newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+                    } else if (orders[b].order_info[c].project.type == 3) {
+                      newObj['type'] = 3
+                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
+                    }
+                  }
+                  obj.order_info.push(newObj)
+                }
+              }
+              tempPatientsTwo.push(obj)
+            }
+            console.log(tempPatientsTwo)
+
+            for (let d = 0; d < tempPatientsTwo.length; d++) {
+              tempPatientsTwo[d]['new_order_info'] = []
+              let project = []
+              let advice = []
+              for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
+                if (tempPatientsTwo[d].order_info[b].type == 1) {
+                  advice.push(tempPatientsTwo[d].order_info[b])
+                } else {
+                  project.push(tempPatientsTwo[d].order_info[b])
+                }
+              }
+              // project = this.uniqueProjectAndAdvice(project)
+              // advice = this.uniqueProjectAndAdvice(advice)
+
+              let obj = {}
+              let price = 0
+
+              let obj2 = {}
+              let price2 = 0
+
+              let obj3 = {}
+              let price3 = 0
+
+              for (let i = 0; i < project.length; i++) {
+                if (project[i].type == 2) {
+                  price = parseFloat(price.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
+                } else if (project[i].type == 3) {
+                  price3 = parseFloat(price3.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
+                }
+              }
+
 
-<style scoped>
+              for (let i = 0; i < advice.length; i++) {
+                price2 = parseFloat(price2.toString()) + parseFloat((parseFloat(advice[i].count.toString()) * parseFloat(advice[i].price.toString()).toFixed(2)).toString())
+              }
 
-</style>
+
+              switch (parseInt(this.item_type)) {
+                case 0:
+
+                  obj['sum'] = price + price2 + price3
+                  obj['price'] = price
+                  obj['item_name'] = '项目'
+                  obj['name'] = tempPatientsTwo[d].name
+                  obj['patient_id'] = tempPatientsTwo[d].patient_id
+                  this.tableData.push(obj)
+
+                  obj2['sum'] = price + price2 + price3
+                  obj2['price'] = price2
+                  obj2['item_name'] = '药品'
+                  obj2['name'] = tempPatientsTwo[d].name
+                  obj2['patient_id'] = tempPatientsTwo[d].patient_id
+                  this.tableData.push(obj2)
+
+                  obj3['sum'] = price + price2 + price3
+                  obj3['price'] = price3
+                  obj3['item_name'] = '耗材'
+                  obj3['name'] = tempPatientsTwo[d].name
+                  obj3['patient_id'] = tempPatientsTwo[d].patient_id
+                  this.tableData.push(obj3)
+                  break
+                case 1:
+                  obj2['sum'] = price2
+                  obj2['price'] = price2
+                  obj2['item_name'] = '药品'
+                  obj2['name'] = tempPatientsTwo[d].name
+                  obj2['patient_id'] = tempPatientsTwo[d].patient_id
+                  this.tableData.push(obj2)
+                  break
+                case 2:
+
+                  obj['sum'] = price
+                  obj['price'] = price
+                  obj['item_name'] = '项目'
+                  obj['name'] = tempPatientsTwo[d].name
+                  obj['patient_id'] = tempPatientsTwo[d].patient_id
+                  this.tableData.push(obj)
+                  break
+                case 3:
+                  obj3['sum'] = price3
+                  obj3['price'] = price3
+                  obj3['item_name'] = '耗材'
+                  obj3['name'] = tempPatientsTwo[d].name
+                  obj3['patient_id'] = tempPatientsTwo[d].patient_id
+                  this.tableData.push(obj3)
+                  break
+
+              }
+
+
+
+            }
+
+            this.handleSpanTempArr()
+            // this.tableData = tempPatientsTwo
+
+            // console.log(tempPatientsTwo.length)
+            //
+
+          }
+          //
+          // console.log('去重前')
+          // console.log(advice)
+          // console.log(project)
+          // //
+          // //
+
+          // //
+          // console.log('去重后')
+          //
+          // console.log(advice.length)
+          // console.log(project.length)
+          //
+          // for (let i = 0; i < project.length; i++) {
+          //   let obj = {}
+          //   let count = 0
+          //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+          //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+          //       count = count + tempPatientsTwo[a].count
+          //       obj['count'] = count
+          //
+          //     }
+          //     obj['price'] = project[i].price
+          //     obj['type'] = project[i].type
+          //     obj['item_name'] = project[i].item_name
+          //     obj['item_id'] = project[i].item_id
+          //     obj['name'] = project[i].name
+          //     obj['patient_id'] = project[i].patient_id
+          //     obj['count'] = count
+          //     this.tableData.push(obj)
+          //   }
+          // }
+          //
+          //
+          // for (let i = 0; i < advice.length; i++) {
+          //   let obj = {}
+          //   let count = 0
+          //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+          //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+          //       count = count + tempPatientsTwo[a].count
+          //       obj['count'] = count
+          //
+          //     }
+          //     obj['price'] = advice[i].price
+          //     obj['type'] = advice[i].type
+          //     obj['item_name'] = advice[i].item_name
+          //     obj['item_id'] = advice[i].item_id
+          //     obj['name'] = advice[i].name
+          //     obj['patient_id'] = advice[i].patient_id
+          //     this.tableData.push(obj)
+          //   }
+          // }
+          // console.log(this.tableData.length)
+          // this.tableData = this.sort(this.tableData)
+
+        })
+      }, uniqueProjectAndAdvice(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      }, sort(arr) {
+        for (var i = 0; i < arr.length - 1; i++) {
+          for (var j = 0; j < arr.length - i - 1; j++) {
+            if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
+              var hand = arr[j]
+              arr[j] = arr[j + 1]
+              arr[j + 1] = hand
+
+            }
+          }
+        }
+        return arr
+      }, handleSpanTempArr() {
+        this.tempArr = []
+
+        for (let i = 0; i < this.tableData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.tableData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.patient_id === this.tableData[index - 1].patient_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+      }, merge({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0 || columnIndex === 3) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      }, 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 === 'sum') {
+            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
+      }
+    },
+    created() {
+      this.getSummaryDetailList()
+
+    }
+  }
+</script>

src/xt_pages/outpatientTool/components/settle.vue

@@ -1,13 +1,478 @@
 <template>
+    <div class="main-contain outpatientChargesManagement">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+                    <!--@click="Action">-->
+                    <!--导出-->
+                    <!--</el-button>-->
+                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                              @keyup.enter.native='searchAction'
+                              class="filter-item"/>
+                    <el-select size="small" v-model="item_type" placeholder="请选择"
+                               style="width:150px;margin-left:10px;" @change="changeItem">
+                        <el-option
+                                label="全部"
+                                value="0">
+                        </el-option>
+                        <el-option
+                                v-for="item,index in items"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
+                    <el-date-picker
+                            v-model="chargeDate"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            @change="changeDate"
+                            end-placeholder="结束日期">
+                    </el-date-picker>
+                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+                </div>
+                <div>
+                    <!-- <el-popover
+                      placement="bottom"
+                      width="210"
+                      trigger="click">
+                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
+                    </el-popover> -->
+                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+                </div>
+            </div>
+            <el-table :data="tableData" border :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      show-summary
+                      max-height="600"
+                      :span-method="merge"
+                      :summary-method="getTotal"
+                      highlight-current-row>
+
+                <el-table-column align="center" prop="name" label="患者名字">
+                    <template slot-scope="scope">{{ scope.row.other_name }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="item_name" label="结算日期">
+                    <template slot-scope="scope">
+                        {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
+                    </template>
+                </el-table-column>
+
+                <el-table-column align="center" prop="item_name" label="结算类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
+                        <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="item_name" label="处方类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
+                        <div v-if="scope.row.med_type == '11'">普通门诊</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="item_name" label="医疗费总额">
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="item_name" label="基金支付金额">
+                    <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="item_name" label="个人账户支付金额">
+                    <template slot-scope="scope">{{scope.row.acct_pay}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="item_name" label="个人支付金额">
+                    <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="total" label="费用总额">
+                    <template slot-scope="scope">
+                        <div>{{scope.row.total.toFixed(2)}}</div>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+        </div>
+
+    </div>
 </template>
 
+
 <script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { GetSummarySettle } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  // import NewStatementPrint from './newStatementPrint'
+  const moment = require('moment')
   export default {
-    name: 'settle'
-  }
-</script>
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [],
+        tempArr: [],
+        sameRowArr: [],
+        tableData: [],
+        chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+        item_type: '0',
+        items: [
+          { id: 1, name: '医保' },
+          { id: 2, name: '自费' },
+          { id: 3, name: '门诊特殊病' },
+          { id: 4, name: '普通门诊' }
+
+        ]
+
+      }
+    },
+    methods: {
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
+      },
+      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
+      },
+      unique(arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+      },
+      changeDate() {
+        // console.log(this.chargeDate)
+        this.getSummarySettleList()
+      },
+      changeItem() {
+        this.getSummarySettleList()
+
+      },
+      searchAction() {
+        this.item_type = '0'
+        this.getSummarySettleList()
+
+      },
+      getSummarySettleList() {
+        let start_time = this.chargeDate[0]
+        let end_time = this.chargeDate[1]
+        let params = {
+          start_time: start_time,
+          end_time: end_time,
+          type: this.item_type,
+          keyword: this.keywords
+        }
+        GetSummarySettle(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = []
+            let data = response.data.data.patients
+
+            for (let i = 0; i < data.length; i++) {
+              let total = 0
+              for (let b = 0; b < data[i].orders.length; b++) {
+                let order = data[i].orders[b]
+                order['other_name'] = data[i].name
+                total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
+              }
+
+              data[i]['total'] = total
+            }
+            console.log(data)
+
+            for (let i = 0; i < data.length; i++) {
+              for (let b = 0; b < data[i].orders.length; b++) {
+                let order = data[i].orders[b]
+                order['total'] = data[i].total
+                this.tableData.push(order)
+
+              }
+            }
+            console.log(this.tableData)
+
+            this.handleSpanTempArr()
+          }
+        })
+      }, uniqueProjectAndAdvice(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      }, sort(arr) {
+        for (var i = 0; i < arr.length - 1; i++) {
+          for (var j = 0; j < arr.length - i - 1; j++) {
+            if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
+              var hand = arr[j]
+              arr[j] = arr[j + 1]
+              arr[j + 1] = hand
+
+            }
+          }
+        }
+        return arr
+      }, handleSpanTempArr() {
+        this.tempArr = []
+
+        for (let i = 0; i < this.tableData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.tableData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.patient_id === this.tableData[index - 1].patient_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+      }, merge({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0 || columnIndex === 8) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      }, 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') {
+            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() {
+
+        let list = []
+        for (let i = 0; i < this.tableData.length; i++) {
+          let order = this.tableData[i]
+          let name = ''
+          let time = ''
+          let balance_accounts = ""
+          let med_type = ""
+
+          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 = '普通门诊'
+          }
 
-<style scoped>
+          let number = ''
 
-</style>
+          let department = ''
+          let doctor_name = ''
+          let order_status = ''
+          let charge_name = ''
+          let insutypeName = ''
+
+
+
+
+
+          if (order.patient != null && order.patient.name.length > 0) {
+            name = order.patient.name
+
+          }
+
+          if (order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0) {
+            department = order.p_info.department.name
+
+          }
+
+          if (order.p_info != null && order.p_info.doctor.length > 0) {
+            doctor_name = order.p_info.doctor
+          }
+
+          if (order.creator != null) {
+            charge_name = this.getName(order.creator)
+          }
+          if (order.insutype == '390') {
+
+            insutypeName = '城乡居民基本医疗保险'
+          } else if (order.insutype == '310') {
+            insutypeName = '职工基本医疗保险'
+
+          }
+
+          if (order.order_status == 1) {
+            order_status = '待结算'
+          }
+
+          if (order.order_status == 2) {
+            order_status = '已结算'
+          }
+
+          if (order.order_status == 3) {
+            order_status = '已退费'
+          }
+
+          if (order.settle_type == 2) {
+            time = this.getTimes(order.settle_start_time)
+          } else {
+            time = this.getTimes(order.settle_accounts_date)
+          }
+
+          var hifmi_pay = 0.00
+
+          if (order.setl_detail.length > 0) {
+            var jsonObj = JSON.parse(order.setl_detail)
+            for (let i = 0; i < jsonObj.length; i++) {
+              if (order.insutype == '310') {
+                if (jsonObj[i].fund_pay_type == '310300') {
+                  hifmi_pay = jsonObj[i].fund_payamt
+                }
+
+              } else if (order.insutype == '390') {
+                if (order.fund_pay_type == '390200') {
+                  hifmi_pay = jsonObj[i].fund_payamt
+                }
+              }
+            }
+          }
+          var hifmi_pay = 0.00
+
+          if (order.setl_detail.length > 0) {
+            var jsonObj = JSON.parse(order.setl_detail)
+            for (let i = 0; i < jsonObj.length; i++) {
+              if (order.insutype == '310') {
+                if (jsonObj[i].fund_pay_type == '310300') {
+                  hifmi_pay = jsonObj[i].fund_payamt
+                }
+              }
+              if (order.insutype == '390') {
+                if (jsonObj[i].fund_pay_type == '390200') {
+                  hifmi_pay = jsonObj[i].fund_payamt
+                }
+              }
+            }
+          }
+
+          let obj = {
+            '就诊号': order.mdtrt_id,
+            '患者姓名': name,
+            '开处时间': time,
+            '险种类型': insutypeName,
+            '应收金额': order.medfee_sumamt,
+            '实收金额': order.medfee_sumamt,
+            '医保统筹金额': order.hifp_pay,
+            '大额基金金额': order.hifob_pay,
+            '大病基金金额': hifmi_pay,
+            '补充保险基金金额': order.hifes_pay,
+            '医疗救助基金金额': order.maf_pay,
+            '公务员基金': order.cvlserv_pay,
+            '个人支付基金': order.psn_cash_pay,
+            '个人账户支付金额': order.acct_pay,
+            '科室': department,
+            '医生姓名': doctor_name,
+            '收费类别': balance_accounts,
+            '收费者姓名': charge_name,
+            '总金额': order.medfee_sumamt,
+            '现金支付': '',
+            '账户支付': '',
+            '支付宝支付': '',
+            '微信支付': '',
+            '其他支付': '',
+            '收费时间': order.setl_time,
+            '收费状态': order_status,
+            '退费日期': ''
+          }
+
+          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]))
+      }
+    },
+    created() {
+      this.getSummarySettleList()
+
+    }
+  }
+</script>

src/xt_pages/outpatientTool/summary.vue

@@ -16,8 +16,8 @@
 
                 </div>
                 <detail v-if="titleType == '明细'"></detail>
-                <settle v-if="titleType == '汇总'"></settle>
-                <gather v-if="titleType == '结算'"></gather>
+                <gather v-if="titleType == '汇总'"></gather>
+                <settle v-if="titleType == '结算'"></settle>
             </div>
         </div>
     </div>

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -149,7 +149,7 @@
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
                 <span v-if="org_id!=10131&& org_id !=10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
                 <span v-if="org_id==10131 || org_id == 10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
-                <!-- <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span> -->
+              
               </span>
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
           </span>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -978,9 +978,9 @@
         getScheduleList(params).then(response => {
           if (response.data.state == 1) {
             this.isloading = false
-
             console.log('22333333333', this.pre_status)
             var list = response.data.data.list
+            console.log("list33333333333333333333",list)
             if (this.pre_status == 0) {
 
               for (let i = 0; i < list.length; i++) {
@@ -1537,8 +1537,6 @@
         this.week_type = 7
       }
       this.org_id = this.$store.getters.xt_user.org.id
-     
-     
     }
   }
 </script>

src/xt_pages/workforce/next_remind_print.vue

@@ -63,8 +63,7 @@
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">
                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''">
-                        <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
+                        <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
                          <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                      </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>

src/xt_pages/workforce/remind_print.vue

@@ -59,12 +59,12 @@
                 <td :width="td_1_width" v-if="printObj.mode == 1">
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
-                
+
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <span v-if="org_id!=9987">
                      <span > 
-                       <span v-if="org_id!=10131 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                       <!-- <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
+                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                     
                        <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                       </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>