diff --git a/acupuncture-ui/src/views/patientFile/index.vue b/acupuncture-ui/src/views/patientFile/index.vue
index 320e6595..a9e6d412 100644
--- a/acupuncture-ui/src/views/patientFile/index.vue
+++ b/acupuncture-ui/src/views/patientFile/index.vue
@@ -10,7 +10,7 @@
     >
       <el-form-item label="" prop="noticeTitle">
         <el-input
-          v-model="queryParams.noticeTitle"
+          v-model="queryParams.param.keywords"
           placeholder="支持姓名、全拼、简拼、手机号吗、证件号码"
           clearable
           @keyup.enter.native="handleQuery"
@@ -19,32 +19,32 @@
       <el-form-item label="年龄范围" prop="createBy">
         <div class="form-item-age">
           <el-input
-            v-model="queryParams.createBy"
+            v-model="queryParams.param.startAge"
             placeholder="最小年龄"
             clearable
             @keyup.enter.native="handleQuery"
           />
           <span>—</span>
           <el-input
-            v-model="queryParams.createBy"
+            v-model="queryParams.param.endAge"
             placeholder="最大年龄"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </div>
       </el-form-item>
-      <el-form-item label="建档组织" prop="noticeType">
+      <el-form-item label="建档组织" prop="tenantId">
         <el-select
-          v-model="queryParams.noticeType"
+          v-model="queryParams.param.tenantId"
           placeholder="公告类型"
           clearable
         >
           <el-option label="dict.label" value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="数据来源" prop="noticeType">
+      <el-form-item label="数据来源" prop="sourceId">
         <el-select
-          v-model="queryParams.noticeType"
+          v-model="queryParams.param.sourceId"
           placeholder="请选择"
           clearable
         >
@@ -143,10 +143,11 @@
         align="center"
         prop="gender"
         show-overflow-tooltip
-        min-width="100"
+        width="100"
       >
         <template slot-scope="scope">
-          
+          <span v-if="scope.row.gender == 0">男</span>
+          <span v-if="scope.row.gender == 1">女</span>
         </template>
       </el-table-column>
 
@@ -155,38 +156,48 @@
         align="center"
         prop="birthDate"
         show-overflow-tooltip
+        width="150"
       />
       <el-table-column
         label="民族"
         align="center"
         prop="ethnicity"
         show-overflow-tooltip
+        width="100"
       />
       <el-table-column
         label="受教育年限"
         align="center"
         prop="educationYears"
         show-overflow-tooltip
+        width="100"
       />
       <el-table-column
         label="手机号码"
         align="center"
         prop="phone"
         show-overflow-tooltip
+        width="150"
       />
       <el-table-column
         label="证件类型"
         align="center"
         prop="idCardType"
         show-overflow-tooltip
-      />
+        width="200"
+      >
+        <template slot-scope="scope">
+          {{ idCardTypeValue[scope.row.idCardType] }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="证件号码"
         align="center"
         prop="idCard"
         show-overflow-tooltip
+        width="180"
       />
-      <el-table-column label="建档日期" align="center" width="100">
+      <el-table-column label="建档日期" align="center" width="130">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -196,20 +207,28 @@
         align="center"
         prop="createBy"
         show-overflow-tooltip
+        width="100"
       />
       <el-table-column
         label="建档组织（医院名称）"
         align="center"
         prop="organization"
         show-overflow-tooltip
+        width="130"
       />
       <el-table-column
         label="来源"
         align="center"
         prop="source"
         show-overflow-tooltip
-      />
-
+        width="100"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.gender == 0">筛查</span>
+          <span v-if="scope.row.gender == 1">录入</span>
+          <span v-if="scope.row.gender == 2">HIS</span>
+        </template>
+      </el-table-column>
       <el-table-column
         fixed="right"
         label="操作"
@@ -285,10 +304,13 @@
         </el-form-item>
         <el-form-item label="证件类型" prop="idCardType">
           <el-select v-model="form.idCardType" placeholder="请选择">
-            <el-option label="身份证" :value="0"> </el-option>
-            <el-option label="身份证" :value="1"> </el-option>
-            <el-option label="身份证" :value="2"> </el-option>
-            <el-option label="身份证" :value="3"> </el-option>
+            <el-option
+              v-for="item in idCardType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="证件号码" prop="idCard">
@@ -327,7 +349,7 @@
             class="avatar-uploader wj-uploader"
             :headers="headers"
             :action="uploadFileUrl1"
-            accept=".zip"
+            accept=".xlsx, .xls"
             :before-upload="handleBeforePdfUpload1"
             :on-success="handleUploadPdfAdd1"
             :file-list="fileList"
@@ -366,6 +388,7 @@ export default {
       },
       uploadFileUrl1: process.env.VUE_APP_BASE_API + "/pms/importTjbgZip", // 上传的图片服务器地址
       fileList: [],
+      // 现病史
       medicalHistory: [
         "高血压",
         "脑血管病",
@@ -386,6 +409,30 @@ export default {
         "肾炎、肾病",
         "高脂血症",
       ],
+      idCardType: [
+        {
+          label: "身份证",
+          value: 0,
+        },
+        {
+          label: "护照或外国人永居证",
+          value: 1,
+        },
+        {
+          label: "港澳居民来往内地通行",
+          value: 2,
+        },
+        {
+          label: "台湾居民来往大陆通行证",
+          value: 3,
+        },
+      ],
+      idCardTypeValue: {
+        0: "身份证",
+        1: "护照或外国人永居证",
+        2: "港澳居民来往内地通行",
+        3: "台湾居民来往大陆通行证",
+      },
       loading: false, // 遮罩层
       ids: [], // 选中数组
       single: true, // 非单个禁用
@@ -411,17 +458,7 @@ export default {
       },
       importform: {},
       // 表单参数
-      form: {
-        name: "",
-        gender: 0,
-        birthDate: "",
-        ethnicity: "",
-        educationYears: "",
-        phone: "",
-        idCardType: "",
-        idCard: "",
-        currentIllnessHistory: [],
-      },
+      form: {},
       // 表单校验
       rules: {
         noticeTitle: [
@@ -483,15 +520,15 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        name: "",
-        gender: 0,
-        birthDate: "",
-        ethnicity: "",
-        educationYears: "",
-        phone: "",
-        idCardType: "",
-        idCard: "",
-        currentIllnessHistory: [],
+        name: "", // 姓名
+        gender: 0, // 性别
+        birthDate: "", // 出生日期
+        ethnicity: "", // 民族
+        educationYears: "", // 教育程度
+        phone: "", // 联系电话
+        idCardType: "", // 证件类型
+        idCard: "", // 证件号码
+        currentIllnessHistory: [], // 现病史
       };
       this.resetForm("form");
     },