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

app/statistics/js/comprehensive-query.js

@@ -2357,7 +2357,7 @@ new Vue({
                hospital: vm.communityCode,
                rang: vm.rangeCode,
                team: vm.teamCode,
                patientType: vm.form2.patientType
                patientType: typeof vm.form2.patientType == 'undefined' ? '' : vm.form2.patientType
              },
              vm.derive + '.xls'
            )

component/statistics/GxbCy/index.js

@@ -372,16 +372,16 @@ Vue.component('gxb-cy', {
        this.title = '康复随访记录明细'
        this.dialogHeader = [
          { label: '姓名', prop: 'name' },
          { label: '性别', prop: 'name' },
          { label: '年龄', prop: 'name' },
          { label: '手机号', prop: 'name' },
          { label: '下转医院', prop: 'name' },
          { label: '下转医生', prop: 'name' },
          { label: '下转时间', prop: 'name' },
          { label: '所属机构', prop: 'name' },
          { label: '随访医生', prop: 'name' },
          { label: '计划随访时间', prop: 'name' },
          { label: '实际随访时间', prop: 'name' }
          { label: '性别', prop: 'sex' },
          { label: '年龄', prop: 'age' },
          { label: '手机号', prop: 'mobile' },
          { label: '下转医院', prop: 'turnHospitalName' },
          { label: '下转医生', prop: 'turnDoctorName' },
          { label: '下转时间', prop: 'createTime' },
          { label: '所属机构', prop: 'hospitalName' },
          { label: '随访医生', prop: 'doctorName' },
          { label: '计划随访时间', prop: 'followupPlanDate' },
          { label: '实际随访时间', prop: 'followupDate' }
        ]
        if (prop == 'v2Num') {
          this.query.visitCount = 2