From bc4f471492a66fae219711b81e11e7f54ee06d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 3 Jul 2024 14:56:34 +0800
Subject: [PATCH] xg

---
 src/views/manage/blacklist/index.vue       |  20 ++---
 src/views/manage/manualReview/index.vue    |  12 ++-
 src/views/manage/patientInfo/index.vue     | 100 ++++++++++-----------
 src/views/manage/preHospitalized/index.vue |  92 +++++++++----------
 src/views/manage/signRecord/index.vue      |  58 ++++++------
 src/views/manage/visitin/index.vue         |  70 +++++++--------
 src/views/manage/visitout/index.vue        |  70 +++++++--------
 src/views/system/followup/index.vue        |  46 +++++-----
 8 files changed, 240 insertions(+), 228 deletions(-)

diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue
index 74938c1..d499e2d 100644
--- a/src/views/manage/blacklist/index.vue
+++ b/src/views/manage/blacklist/index.vue
@@ -10,6 +10,14 @@
           <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="异常原因" prop="abnormalCauseValue">
+          <el-select v-model="queryParams.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:200px"
+            clearable>
+            <el-option v-for="item in abnormalCauselist" :key="item.id" :label="item.abnormalCauseValue"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
           <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
             @clear="clearhospitalAgency" @change="changehospitalAgency">
@@ -17,27 +25,19 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="院区" prop="campusAgencyId">
           <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
             @clear="clearcampusAgency" @change="changecampusAgency">
             <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="科室" prop="departmentId">
           <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable>
             <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="异常原因" prop="abnormalCauseValue">
-          <el-select v-model="queryParams.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:200px"
-            clearable>
-            <el-option v-for="item in abnormalCauselist" :key="item.id" :label="item.abnormalCauseValue"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <!-- (CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接) -->
         <!-- <el-form-item label="来源" prop="blacklistSource">
         <el-select v-model="queryParams.blacklistSource" placeholder="请选择来源" clearable>
diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue
index d363e97..3c5f681 100644
--- a/src/views/manage/manualReview/index.vue
+++ b/src/views/manage/manualReview/index.vue
@@ -37,21 +37,21 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="院区" prop="campusAgencyId">
           <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
             @clear="clearcampusAgency" @change="changecampusAgency">
             <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="科室" prop="departmentId">
           <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
             @clear="cleardepartment" @change="changedepartment">
             <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="病区" prop="wardId">
           <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
             <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
             </el-option>
@@ -97,7 +97,7 @@
           <template slot-scope="scope">
             {{ scope.row.portaitCheckStatus == "AGREE" ? "审核通过" : "" }}
             {{ scope.row.portaitCheckStatus == "DISAGREE" ? "已忽略" : "" }}
-            {{ scope.row.portaitCheckStatus ==null ? "未审核" : "" }}
+            {{ scope.row.portaitCheckStatus == null ? "未审核" : "" }}
           </template>
         </el-table-column>
         <el-table-column label="路径审核状态" align="center" prop="routeCheckStatus" width="100">
@@ -190,6 +190,9 @@ export default {
   created() {
     if (localStorage.getItem('manualReviewquery')) {
       this.queryParams = JSON.parse(localStorage.getItem('manualReviewquery'))
+      this.queryParams.hospitalAgencyId = undefined
+      this.queryParams.campusAgencyId = undefined
+      this.queryParams.departmentId = undefined
     }
     this.getList();
     this.selectAgencyinfo();
@@ -349,6 +352,7 @@ export default {
       // })
       //医生
       this.usergetListinfo();
+      this.getMaxTableHeight();
     },
     //选中院区获取科室
     changecampusAgency(id) {
diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue
index 79d0fe2..5b43393 100644
--- a/src/views/manage/patientInfo/index.vue
+++ b/src/views/manage/patientInfo/index.vue
@@ -19,56 +19,6 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-            @clear="clearhospitalAgency" @change="changehospitalAgency">
-            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
-            @clear="clearcampusAgency" @change="changecampusAgency">
-            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
-            @clear="cleardepartment" @change="changedepartment">
-            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
-            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="门诊号" prop="outpatientNumber">
-        <el-input v-model="queryParams.outpatientNumber" placeholder="请输入门诊号" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
-        <!-- <el-form-item label="出生日期" prop="birthDate">
-        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
-          style="width:200px" placeholder="请选择出生日期">
-        </el-date-picker>
-      </el-form-item> -->
-        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
-        <!-- <el-form-item label="患者类型" prop="patientType">
-        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
-          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item> -->
-        <el-form-item label="主治医生" prop="attendingPhysicianId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.attendingPhysicianId" style="width:200px" filterable placeholder="请选择主治医生"
-            clearable>
-            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
-              :value="item.userId">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <!-- <el-form-item label="手术名称" prop="surgicalName">
         <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
@@ -92,6 +42,56 @@
         </el-date-picker>
       </el-form-item> -->
         <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency" @change="changehospitalAgency">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyId">
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency" @change="changecampusAgency">
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentId">
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment" @change="changedepartment">
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="病区" prop="wardId">
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="门诊号" prop="outpatientNumber">
+        <el-input v-model="queryParams.outpatientNumber" placeholder="请输入门诊号" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+        <!-- <el-form-item label="出生日期" prop="birthDate">
+        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
+          style="width:200px" placeholder="请选择出生日期">
+        </el-date-picker>
+      </el-form-item> -->
+        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
+        <!-- <el-form-item label="患者类型" prop="patientType">
+        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+        <el-form-item label="主治医生" prop="attendingPhysicianId">
+          <el-select v-model="queryParams.attendingPhysicianId" style="width:200px" filterable placeholder="请选择主治医生"
+            clearable>
+            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index 4ff09a1..6277382 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -33,52 +33,6 @@
         <!-- <el-form-item label="诊断" prop="mainDiagnosis">
         <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
-            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
-            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
-            @clear="clearcampusAgency" @change="changecampusAgency">
-            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
-            @clear="cleardepartment" @change="changedepartment">
-            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
-            <el-option v-for="item in wardlist" :key="item.id" :label="item.wardName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开证医生" prop="certificateIssuingDoctor" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.certificateIssuingDoctorId" filterable placeholder="请选择主治医生"
-            style="width: 200px" clearable>
-            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
-              :value="item.userId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="出生日期" prop="birthDate">
-        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
-          style="width:200px" placeholder="请选择出生日期">
-        </el-date-picker>
-      </el-form-item> -->
-        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
-        <!-- <el-form-item label="患者类型" prop="patientType">
-        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
-          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
       </el-form-item> -->
         <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
           <el-input v-model="queryParams.appointmentTreatmentGroup" placeholder="请输入预约治疗组" clearable
@@ -101,6 +55,52 @@
         <!-- <el-form-item label="出院方式" prop="dischargeMethod">
         <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
+            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyId">
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
+            @clear="clearcampusAgency" @change="changecampusAgency">
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentId">
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
+            @clear="cleardepartment" @change="changedepartment">
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="病区" prop="wardId">
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.wardName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
+          <el-select v-model="queryParams.certificateIssuingDoctorId" filterable placeholder="请选择主治医生"
+            style="width: 200px" clearable>
+            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="出生日期" prop="birthDate">
+        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
+          style="width:200px" placeholder="请选择出生日期">
+        </el-date-picker>
+      </el-form-item> -->
+        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
+        <!-- <el-form-item label="患者类型" prop="patientType">
+        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
       </el-form-item> -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index 494639e..8bef6e0 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/src/views/manage/signRecord/index.vue
@@ -29,33 +29,6 @@
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item> -->
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-            @clear="clearhospitalAgency" @change="changehospitalAgency">
-            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
-            @clear="clearcampusAgency" @change="changecampusAgency">
-            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
-            @clear="cleardepartment" @change="changedepartment">
-            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
-            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <!-- 门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
         <el-form-item label="就诊方式" prop="visitMethod">
           <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
@@ -86,6 +59,33 @@
         <!-- <el-form-item label="身份证号" prop="cardNo">
         <el-input v-model="queryParams.cardNo" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency" @change="changehospitalAgency">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyId">
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency" @change="changecampusAgency">
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentId">
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment" @change="changedepartment">
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="病区" prop="wardId">
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -357,6 +357,9 @@ export default {
   created() {
     if (localStorage.getItem('signRecordquery')) {
       this.queryParams = JSON.parse(localStorage.getItem('signRecordquery'))
+      this.queryParams.hospitalAgencyId = undefined
+      this.queryParams.campusAgencyId = undefined
+      this.queryParams.departmentId = undefined
     }
     this.selectAgencyinfo();
   },
@@ -621,6 +624,7 @@ export default {
       this.queryParams.departmentId = null
       this.queryParams.wardId = null
       this.queryParams.certificateIssuingDoctorId = null
+      this.getMaxTableHeight();
       // })
     },
     //选中院区获取科室
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index edaab93..0c2800f 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -34,41 +34,6 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width: 200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
-            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
-            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
-            @clear="clearcampusAgency" @change="changecampusAgency">
-            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
-            @clear="cleardepartment" @change="changedepartment">
-            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
-            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysician" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width: 200px"
-            clearable>
-            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
-              :value="item.userId">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width: 200px" />
         </el-form-item>
@@ -100,6 +65,41 @@
         <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
+            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyId">
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
+            @clear="clearcampusAgency" @change="changecampusAgency">
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentId">
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
+            @clear="cleardepartment" @change="changedepartment">
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="病区" prop="wardId">
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="主治医生" prop="attendingPhysician">
+          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width: 200px"
+            clearable>
+            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 2fa1f90..3ac6145 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -29,41 +29,6 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
-            @clear="clearhospitalAgency" @change="changehospitalAgency">
-            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
-            @clear="clearcampusAgency" @change="changecampusAgency">
-            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
-            @clear="cleardepartment" @change="changedepartment">
-            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
-            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysician" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px"
-            clearable>
-            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
-              :value="item.userId">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
@@ -77,6 +42,41 @@
           <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
             style="width:200px" />
         </el-form-item>
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
+            @clear="clearhospitalAgency" @change="changehospitalAgency">
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="院区" prop="campusAgencyId">
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
+            @clear="clearcampusAgency" @change="changecampusAgency">
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentId">
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
+            @clear="cleardepartment" @change="changedepartment">
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="病区" prop="wardId">
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="主治医生" prop="attendingPhysician">
+          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px"
+            clearable>
+            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <!-- <el-form-item label="出生日期" prop="birthDate">
         <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
           style="width:200px" placeholder="请选择出生日期">
diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue
index 1cfb393..0ece974 100644
--- a/src/views/system/followup/index.vue
+++ b/src/views/system/followup/index.vue
@@ -25,26 +25,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
-            @clear="clearcampusAgency" @change="changecampusAgency">
-            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
-            @clear="cleardepartment" @change="changedepartment">
-            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
-            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="就诊类型" prop="suitRange">
           <el-select v-model="queryParams.suitRange" placeholder="请选择就诊类型" clearable @change="change">
             <el-option v-for="item in visitoptions" :key="item.value" :label="item.label" :value="item.value">
@@ -69,7 +49,27 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysicianId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="院区" prop="campusAgencyId">
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
+            @clear="clearcampusAgency" @change="changecampusAgency">
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departmentId">
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
+            @clear="cleardepartment" @change="changedepartment">
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="病区" prop="wardId">
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="主治医生" prop="attendingPhysicianId">
           <el-select v-model="queryParams.attendingPhysicianId" style="width: 200px" filterable placeholder="请选择主治医生"
             clearable>
             <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
@@ -254,6 +254,9 @@ export default {
   created() {
     if (localStorage.getItem('followupquery')) {
       this.queryParams = JSON.parse(localStorage.getItem('followupquery'))
+      this.queryParams.hospitalAgencyId = undefined
+      this.queryParams.campusAgencyId = undefined
+      this.queryParams.departmentId = undefined
     }
     this.getList();
     this.selectAgencyinfo();
@@ -347,6 +350,7 @@ export default {
       // })
       //医生
       this.usergetListinfo();
+      this.getMaxTableHeight();
     },
     //选中院区获取科室
     changecampusAgency(id) {