Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

component/statistics/GxbCy/index.html

@@ -69,7 +69,7 @@
      </el-form-item>
      <template v-if="title=='康复随访记录明细'">
        <el-form-item label="下转医生：">
          <el-input v-model="query.doctor"></el-input>
          <el-input v-model="query.doctor" placeholder="请输入下转医生查询"></el-input>
        </el-form-item>
        <el-form-item label="随访医生：">
          <el-input v-model="query.mobile" placeholder="请输入手机号码查询"></el-input>

component/statistics/GxbEvaluation/index.js

@@ -281,34 +281,37 @@ Vue.component('gxb-evaluation', {
      this.query = {}
      switch (prop) {
        case 'totalNum':
          this.query.screenResultCode = "" 
          this.title = '个案数据列表'
          break
        case 'dailyNum':
          this.query.screenResultCode = ""
          this.query.surveyStatus = 1
          this.title = '个案数据列表'
          break
        case 'inScreenNum':
          this.query.screenResultCode = ""
          this.query.surveyStatus = 2
          this.title = '个案数据列表'
          break
        case 'lRiskNum':
          this.query.screenResultCode = 5
          this.query.screenResultCode = "5"
          this.title = '个案数据列表'
          break
        case 'mRiskNum':
          this.query.screenResultCode = 4
          this.query.screenResultCode = "4"
          this.title = '个案数据列表'
          break
        case 'hRiskNum':
          this.query.screenResultCode = 3
          this.query.screenResultCode = "3"
          this.title = '个案数据列表'
          break
        case 'uhRiskNum':
          this.query.screenResultCode = 2
          this.query.screenResultCode = "2"
          this.title = '个案数据列表'
          break
        case 'ehRiskNum':
          this.query.screenResultCode = 1
          this.query.screenResultCode = "1"
          this.title = '个案数据列表'
          break
        case 'messageTimes':

component/statistics/GxbMz/index.html

@@ -64,14 +64,14 @@
  <el-dialog :visible.sync="visible" :title="title" @close="closeDialog" width="1200px">
    <el-form inline size="mini">
      <el-form-item label="居民姓名：">
        <el-input v-model="query.name" placeholder="请输入居民姓名查询"></el-input>
        <el-input v-model="query.patientName" placeholder="请输入居民姓名查询"></el-input>
      </el-form-item>
      <template v-if="title=='康复下转明细列表'">
        <el-form-item label="下转医生：">
          <el-input v-model="query.hospital" placeholder="请输入预约医院查询"></el-input>
          <el-input v-model="query.hospitalDoctor" placeholder="请输入预约医院查询"></el-input>
        </el-form-item>
        <el-form-item label="接收医生：">
          <el-input v-model="query.deptName" placeholder="请输入科室名称查询"></el-input>
          <el-input v-model="query.doctor" placeholder="请输入科室名称查询"></el-input>
        </el-form-item>
        <el-form-item label="下转状态：">
          <el-select v-model="query.status" placeholder="请选择">
@@ -84,27 +84,27 @@
          </el-select>
        </el-form-item>
        <el-form-item label="接收社区医院：">
          <el-select v-model="form.orgCode" placeholder="请选择" filterable>
            <el-option v-for="(item,index) in communityHospitals" :key="item.value" :value="item.value" :label="item.label" :key="item.value"></el-option>
          <el-select v-model="query.orgCode" placeholder="请选择" filterable>
            <el-option v-for="(option, index) in communityHospitals" :value="option.value" :label="option.label" :key="option.value"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="档案状态：">
          <el-select v-model="form.archiveStatus" placeholder="请选择">
            <el-option v-for="(item,index) in archiveList" :key="item.value" :value="item.code" :label="item.value" :key="item.code"></el-option>
          <el-select v-model="query.archiveStatus" placeholder="请选择">
            <el-option v-for="(item,index) in archiveList"  :value="item.code" :label="item.value" :key="item.code"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="患者类型：">
          <el-select v-model="form.patientType" placeholder="请选择">
            <el-option v-for="(item,index) in inviteStatus" :key="item.value" :value="item.value" :label="item.label" :key="item.value"></el-option>
          <el-select v-model="query.patientType" placeholder="请选择">
            <el-option v-for="(item,index) in inviteStatus" :value="item.value" :label="item.label" :key="item.value"></el-option>
          </el-select>
        </el-form-item>
      </template>
      <template v-else>
        <el-form-item label="签约医院：">
          <el-input v-model="query.signDoctorName" placeholder="请输入签约医生查询"></el-input>
          <el-input v-model="query.signHospitalName" placeholder="请输入签约医院查询"></el-input>
        </el-form-item>
        <el-form-item label="手机号码：">
          <el-input v-model="query.signDoctorName" placeholder="请输入签约医生查询"></el-input>
          <el-input v-model="query.mobile" placeholder="请输入手机号码查询"></el-input>
        </el-form-item>
        <el-form-item label="性别：">
          <el-select v-model="query.sex">
@@ -182,12 +182,10 @@
  </el-dialog>
  <el-dialog title="查看签约信息" :visible.sync="dialogVisible" width="70%" append-to-body>
    <el-table border :data="signatoryList" style="width: 100%" height="500" class="mt20">
      <template>
        <el-table-column prop="hospitalName" label="签约社区医院" align="center"></el-table-column>
        <el-table-column prop="doctorName" label="签约医生" align="center"></el-table-column>
        <el-table-column prop="applyDate" label="签约时间" align="center"></el-table-column>
        <el-table-column prop="signYear" label="签约年度" align="center"></el-table-column>
      </template>
      <el-table-column prop="hospitalName" label="签约社区医院" align="center"></el-table-column>
      <el-table-column prop="doctorName" label="签约医生" align="center"></el-table-column>
      <el-table-column prop="applyDate" label="签约时间" align="center"></el-table-column>
      <el-table-column prop="signYear" label="签约年度" align="center"></el-table-column>
    </el-table>
  </el-dialog>
</div>

component/statistics/GxbMz/index.js

@@ -334,13 +334,31 @@ Vue.component('gxb-mz', {
      var params = {
        ...this.query
      }
      this.query = {
        sex: '',
        range: params.range,
        area: params.area,
        hospital: params.hospital,
        team: params.team
      if (this.title == '康复下转明细列表') {
        this.query = {
          status: '',
          hospitalCode: '',
          orgCode: '',
          archiveStatus: '',
          patientType: '',
          range: params.range,
          area: params.area,
          hospital: params.hospital,
          team: params.team
        }
      } else if (this.title == '下转情况数据列表') {
        this.query = {
          sex: '',
          isSign: '',
          eventType: '',
          range: params.range,
          area: params.area,
          hospital: params.hospital,
          team: params.team
        }
      }
      
    },
    handleCurrentChange(val) {
      this.page = val
@@ -410,6 +428,7 @@ Vue.component('gxb-mz', {
          archiveStatus: '',
          patientType: ''
        }
        
        this.visible = true
        this.title = '康复下转明细列表'
        this.dialogHeader = [
@@ -429,10 +448,10 @@ Vue.component('gxb-mz', {
        ]
        switch (prop) {
          case 'mzTimes':
            this.query.patientType = 1
            this.query.patientType = "1"
            break
          case 'zyTimes':
            this.query.patientType = 2
            this.query.patientType = "2"
            break
        }
      } else if (['totalNum', 'mzNum', 'zyNum'].includes(prop)) {
@@ -457,10 +476,10 @@ Vue.component('gxb-mz', {
        ]
        switch (prop) {
          case 'mzNum':
            this.query.eventType = 1
            this.query.eventType = "1"
            break
          case 'zyNum':
            this.query.eventType = 2
            this.query.eventType = "2"
            break
        }
      }
@@ -551,7 +570,7 @@ Vue.component('gxb-mz', {
      var params = {
        ...this.query,
        page: this.page,
        pageSize: this.size
        size: this.size
      }
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01'