修复bug

component/statistics/GxbCy/index.html

@@ -52,7 +52,7 @@
      <span class="eliminate" @click="eliminateClick">清除筛选条件</span>
    </div>
  </div>
  <el-table :data="tableData" style="width: 100%" row-key="code" lazy :load="load" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
  <el-table :data="tableData" style="width: 100%" v-loading="loading" row-key="code" lazy :load="load" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
    <el-table-column :label="item.label" v-for="(item,index) in tableHeader" :min-width="item.width" :key="item.prop" :prop="item.prop"></el-table-column>
    <el-table-column :label="item.label" v-for="(item,index) in tableHeaderChildren" :key="index" align="center">
      <el-table-column :label="el.label" :min-width="el.width" v-for="el in item.children" :key="el.prop">

component/statistics/GxbCy/index.js

@@ -205,6 +205,7 @@ Vue.component('gxb-cy', {
        ...this.form,
        isTotal: 1
      }
      vm.tableData = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'

component/statistics/GxbEvaluation/index.html

@@ -133,7 +133,7 @@
        <span @click="dialogReset" style="color: #676a6c; cursor: pointer">清除筛选条件</span>
      </el-form-item>
    </el-form>
    <el-table :data="dialogTableData" border>
    <el-table :data="dialogTableData" border v-loading="dialogLoading">
      <el-table-column type="index" label="序号"></el-table-column>
      <el-table-column v-for="item in dialogHeader" :label="item.label" :prop="item.prop" :key="item.prop" :render-header="renderHeader">
        <template slot-scope="scope">

component/statistics/GxbEvaluation/index.js

@@ -77,7 +77,8 @@ Vue.component('gxb-evaluation', {
      messageVisible: false,
      messInfo: null,
      remind: '',
      dialogExportLoading: false
      dialogExportLoading: false,
      dialogLoading: false
    }
  },
  methods: {
@@ -149,6 +150,7 @@ Vue.component('gxb-evaluation', {
        ...this.form,
        isTotal: 1
      }
      vm.tableData = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
@@ -395,6 +397,7 @@ Vue.component('gxb-evaluation', {
    },
    gxbCaseDataPage() {
      var vm = this
      vm.dialogLoading = true
      var params = JSON.parse(JSON.stringify(this.query))
      params.page = this.page
      params.pageSize = this.size
@@ -413,6 +416,7 @@ Vue.component('gxb-evaluation', {
          vm.dialogTableData = res.detailModelList
          vm.total = res.totalCount
        }
        vm.dialogLoading = false
      })
    },
    handleCurrentChange(val) {
@@ -433,6 +437,7 @@ Vue.component('gxb-evaluation', {
    },
    selectSmsInfoList() {
      var vm = this
      vm.dialogLoading = true
      var params = {
        ...this.query
      }
@@ -453,6 +458,7 @@ Vue.component('gxb-evaluation', {
          vm.dialogTableData = res.detailModelList
          vm.total = res.totalCount
        }
        vm.dialogLoading = false
      })
    },
    dialogExportFn() {

component/statistics/GxbManage/index.js

@@ -74,10 +74,10 @@ Vue.component('gxb-manage', {
        { label: '证件号码', prop: 'idcard', width: '90' },
        { label: '社区医院', prop: 'signHospitalName', width: '90' },
        { label: '签约医生', prop: 'signDoctorName', width: '90' },
        { label: '最近一次门诊下转时间', prop: 'czrq', width: '90' },
        { label: '最近一次上转科室', prop: 'deptName', width: '90' },
        { label: '最近一次出院下转时间', prop: 'createTime', width: '90' },
        { label: '最近一次出院下转诊断', prop: 'diagnosisName', width: '90' }
        { label: '最近一次门诊下转时间', prop: 'mzCreateTime', width: '90' },
        { label: '最近一次门诊下转诊断', prop: 'mzDiagnosisName', width: '90' },
        { label: '最近一次出院下转时间', prop: 'zyCreateTime', width: '90' },
        { label: '最近一次出院下转诊断', prop: 'zyDiagnosisName', width: '90' }
      ],
      turnDownTableHeader: [
        { label: '姓名', prop: 'name', width: '90' },
@@ -170,10 +170,10 @@ Vue.component('gxb-manage', {
        this.query.team = row.code
      }
      this.dataRangeOption = [{ label: row.name, value: row.code }]
      if (column == 'mzNum' || column == 'zyNum') {
      if (column == 'mzNum') {
        this.mzDialogVisible = true
        this.turnUpToMzDetailPage()
      } else if (column == 'turnDownNum') {
      } else if (column == 'turnDownNum' || column == 'zyNum') {
        this.mzDialogVisible = true
        this.turnDownManageDetailPage()
      } else if (column == 'totalNum') {
@@ -190,6 +190,7 @@ Vue.component('gxb-manage', {
      var params = JSON.parse(JSON.stringify(this.query))
      params.page = this.page
      params.pageSize = this.size
      vm.dataInfo = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
@@ -213,6 +214,7 @@ Vue.component('gxb-manage', {
      var params = JSON.parse(JSON.stringify(this.query))
      params.page = this.page
      params.pageSize = this.size
      vm.dataInfo = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
@@ -234,8 +236,14 @@ Vue.component('gxb-manage', {
      if (prop == 'name') {
        if (this.title == '上转预约明细列表') {
          EventBus.$emit('preview-person-info', { type: '2', code: row.code })
        } else {
        } else if (this.title == '个案数据列表') {
          EventBus.$emit('preview-person-info', { type: '1', code: row.code })
        } else if (this.title == '上转转门诊明细') {
          EventBus.$emit('preview-person-info', { type: '3', code: row.code })
        } else if (this.title == '门诊转住院明细') {
          EventBus.$emit('preview-person-info', { type: '4', code: row.code })
        } else if (this.title == '下转管理明细') {
          EventBus.$emit('preview-person-info', { type: '5', code: row.code })
        }
      }
    },
@@ -244,6 +252,7 @@ Vue.component('gxb-manage', {
      this.loadingTwo = true
      var url = ''
      var params = JSON.parse(JSON.stringify(this.query))
      vm.dataInfo = []
      params.page = this.page
      params.pageSize = this.size
      if (this.yearType == '1') {
@@ -275,6 +284,7 @@ Vue.component('gxb-manage', {
      var params = JSON.parse(JSON.stringify(this.query))
      params.page = this.page
      params.pageSize = this.size
      vm.dataInfo = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
@@ -477,6 +487,7 @@ Vue.component('gxb-manage', {
        ...this.form,
        isTotal: 1
      }
      vm.tableData = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'

component/statistics/GxbManageSum/index.js

@@ -119,6 +119,7 @@ Vue.component('gxb-manage-sum', {
        ...this.form,
        isTotal: 1
      }
      vm.tableData = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
@@ -268,7 +269,7 @@ Vue.component('gxb-manage-sum', {
      })
    },
    toPage(row, prop) {
      if(!row.code)return
      if (!row.code) return
      var len = row.code.length
      var range, area, hospital, team
      if (len == 6 && row.code.indexOf('3502') > -1) {

component/statistics/GxbMz/index.html

@@ -156,7 +156,7 @@
        <span @click="dialogReset" style="color: #676a6c; cursor: pointer">清除筛选条件</span>
      </el-form-item>
    </el-form>
    <el-table :data="dialogTableData" border>
    <el-table :data="dialogTableData" border v-loading="dialogLoading">
      <el-table-column label="序号" type="index"></el-table-column>
      <el-table-column v-for="item in dialogHeader" :label="item.label" :render-header="renderHeader">
        <template slot-scope="scope">

component/statistics/GxbMz/index.js

@@ -168,6 +168,7 @@ Vue.component('gxb-mz', {
        ...this.form,
        isTotal: 1
      }
      vm.tableData = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
@@ -595,13 +596,13 @@ Vue.component('gxb-mz', {
          params.endDate = this.chooseTime[1]
        }
      }
      this.loading = true
      this.dialogLoading = true
      httpRequest.get('statistics/collaborate/turnDownDataPage', { data: params }).then(function (res) {
        if (res.status == 200) {
          vm.dialogTableData = res.detailModelList
          vm.total = res.totalCount
        }
        vm.loading = false
        vm.dialogLoading = false
      })
    },

component/statistics/GxbTurnup/index.html

@@ -115,7 +115,7 @@
        <span @click="dialogReset" style="color: #676a6c; cursor: pointer">清除筛选条件</span>
      </el-form-item>
    </el-form>
    <el-table :data="dialogTableData" border>
    <el-table :data="dialogTableData" border v-loading="dialogLoading">
      <el-table-column type="index" label="序号"></el-table-column>
      <el-table-column v-for="item in dialogHeader" :label="item.label" :key="item.prop" :render-header="renderHeader">
        <template slot-scope="scope">

component/statistics/GxbTurnup/index.js

@@ -133,6 +133,7 @@ Vue.component('gxb-turnup', {
        ...this.form,
        isTotal: 1
      }
      vm.tableData = []
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
@@ -361,6 +362,7 @@ Vue.component('gxb-turnup', {
    },
    gxbTurnUpInfoPage() {
      var vm = this
      vm.dialogLoading = true
      var params = {
        ...this.query,
        page: this.page,
@@ -380,6 +382,7 @@ Vue.component('gxb-turnup', {
          vm.dialogTableData = res.detailModelList
          vm.total = res.totalCount
        }
        vm.dialogLoading = false
      })
    },
    seePatientDetail(row, prop) {

component/statistics/PersonInfo/index.html

@@ -14,7 +14,7 @@
    </div>
  </div>
  <el-tabs v-model="type" type="card" v-if="!rehabilitationDetailVisible" v-loading="loading" @tab-click="handleClick">
    <el-tab-pane label="评估" name="1" class="scollY">
    <el-tab-pane :label="'评估'+'('+patientInfo.assessNum+')'" name="1" class="scollY">
      <div class="year-item" v-for="item in assessment">
        <div class="year">
          <div class="time-label">{{item.year}}</div>
@@ -38,7 +38,7 @@
        </div>
      </div>
    </el-tab-pane>
    <el-tab-pane label="上转" name="2" class="scollY">
    <el-tab-pane :label="'上转'+'('+patientInfo.turnUpNum+')'" name="2" class="scollY">
      <div class="year-item" v-for="item in turnup">
        <div class="year">
          <div class="time-label">{{item.year}}</div>
@@ -61,7 +61,7 @@
        </div>
      </div>
    </el-tab-pane>
    <el-tab-pane label="就诊" name="3" class="scollY">
    <el-tab-pane :label="'就诊'+'('+patientInfo.visitNum+')'" name="3" class="scollY">
      <div class="year-item" v-for="item in jzList">
        <div class="year">
          <div class="time-label">{{item.year}}</div>
@@ -87,7 +87,7 @@
        </div>
      </div>
    </el-tab-pane>
    <el-tab-pane label="下转" name="4" class="scollY">
    <el-tab-pane :label="'下转'+'('+patientInfo.turnDownNum+')'" name="4" class="scollY">
      <div class="year-item" v-for="item in turnDown">
        <div class="year">
          <div class="time-label">{{item.year}}</div>
@@ -117,7 +117,7 @@
        </div>
      </div>
    </el-tab-pane>
    <el-tab-pane label="康复计划" name="5" class="scollY">
    <el-tab-pane :label="'康复计划'+'('+patientInfo.rehabilitationNum+')'" name="5" class="scollY">
      <div class="year-item" v-for="item in rehabilitation">
        <div class="year">
          <div class="time-label">{{item.year}}</div>

component/statistics/PersonInfo/index.js

@@ -121,6 +121,7 @@ Vue.component('person-info', {
    getPatientDetailList(type) {
      var vm = this
      vm.loading = true
      console.log('kkkkkkkkkkkkkkkkkkkkooooooooooo', type)
      httpRequest.get('statistics/collaborate/patientDetailList', { data: { code: vm.code, type: type } }).then(function (res) {
        var data = vm.transformDataToAssessmentFormat(res.data, type)
        vm[vm.tabListName[Number(type) - 1]] = data
@@ -132,7 +133,7 @@ Vue.component('person-info', {
      this.type = data.type
      this.code = data.code
      this.getPatientInfo()
      this.getPatientDetailList(1)
      this.getPatientDetailList(this.type)
    },
    closeDialog() {
      this.visible = false