diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index e703c0a..f903af8 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -107,6 +107,11 @@
       <div class="listBtn">
         <el-button type="primary" class="commonbutton" @click="btnScanRecover">扫码回收</el-button>
       </div>
+      <div class="listBtn">
+        <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
+            <el-button type="" style="width:100%">导出excel</el-button>
+          </download-excel>
+      </div>
     </div>
     <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogVisible" width="400" :append-to-body="true"
       :close-on-click-modal="false">
@@ -125,12 +130,11 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce,arrayExistObj } from "@/utlis/proFunc";
+import { dddw, objCopy, arrayReduce,arrayExistObj,deepCopy } from "@/utlis/proFunc";
 import { savePeoplePhoto } from "../../utlis/proApi";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
-
 export default {
   components: {
     PatientRegisterEdit,
@@ -158,6 +162,40 @@ export default {
       loadOptsInit: {},
       lazyLoading:false,
       dom:null,
+      jsonFields: {
+        回收:"isRecoverGuide",
+        体检进度: "completeFlag",
+        锁住: "isLock",
+        单位: "customerOrgParentName",
+        部门: "customerOrgName",
+        姓名: "patientName",
+        性别: "sexName",
+        年龄: "age",
+        条码号: "patientRegisterNo",
+        档案号: "patientNo",
+        体检次数: "medicalTimes",
+        分组套餐: "groupPack",
+        民族: "nationName",
+        身份证: "idNo",
+        出生日期: "birthDate",
+        邮箱: "email",
+        手机: "mobileTelephone",
+        电话: "telephone",
+        地址: "address",
+        体检卡号: "medicalCardNo",
+        工卡号: "jobCardNo",
+        婚姻状况: "maritalStatusName",
+        体检类别: "medicalTypeName",
+        人员类别: "personnelTypeName",
+        职务: "jobPost",
+        职称: "jobTitle", 
+        介绍人: "salesman",
+        VIP: "isVip",
+        登记人: "creatorName",
+        登记日期: "creationTime",
+        上传: "isUpload"
+      },
+      tableName:""
     };
   },
 
@@ -521,6 +559,22 @@ export default {
         }
       })
     },
+    btnExport(elId) {
+      let tableDatas = deepCopy(this.tableData)
+      tableDatas.forEach((e, index) => {
+        if(e.completeFlag) e.completeFlag = this.ldddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
+        if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
+        if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
+          e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+        } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
+          e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+        }
+        if (e.idNo) e.idNo = e.idNo + '&'
+        if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
+      })
+      this.tableName = '体检表回收' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      return tableDatas;
+    },
 
   },
 
diff --git a/src/components/room/room.vue b/src/components/room/room.vue
index 09c5762..8b9cda2 100644
--- a/src/components/room/room.vue
+++ b/src/components/room/room.vue
@@ -17,6 +17,15 @@
                 </el-option>
               </el-select>
             </div>
+            <div>
+              <span>项目类别：</span>
+              <el-select v-model="itemTypeId" placeholder="请选择项目类别" default-first-option clearable filterable
+                style="margin-left: 10px" @change="changeItemTypeId" size="small" @clear="clearData" >
+                <el-option v-for="item in dict.itemTypeTree" :key="item.id" :label="item.displayName" :value="item.id">
+                  {{ item.displayName }}
+                </el-option>
+              </el-select>
+            </div>
           </div>
           <div>
             <el-table :data="tableData" ref="tableData" style="margin-top: 2px" row-key="id" border height="240px"
@@ -158,6 +167,8 @@ export default {
         isActive: "Y"
       },
       formInit: {}, //表单初始值
+      itemTypeId:"",
+      backupTableData:[]
     };
   },
   computed: {
@@ -309,6 +320,7 @@ export default {
           this.tableData = res.data.filter(e => {
             return medicalCenterId ? (e.medicalCenterId == medicalCenterId) : e
           });
+          this.backupTableData= this.tableData;
         }
       });
     },
@@ -318,7 +330,13 @@ export default {
       // console.log('changeMedicalCenter', v)
       this.getRoom(v)
     },
-
+    changeItemTypeId(e){
+      const filteredItems = this.backupTableData.filter(item => item.itemTypeId == e);
+      this.tableData = filteredItems;
+    },
+    clearData(){
+      this.tableData = this.backupTableData;
+    },
     //点击房间
     rowClick(row) {
       this.curRoom = row