diff --git a/acupuncture-前台/src/utils/request.js b/acupuncture-前台/src/utils/request.js
index e943a3be..224dd698 100644
--- a/acupuncture-前台/src/utils/request.js
+++ b/acupuncture-前台/src/utils/request.js
@@ -30,8 +30,18 @@ service.interceptors.request.use(
     if (getToken() && !isToken) {
       config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    if (localStorage.getItem("tenantId")) {
-      config.headers.TENANT_ID = localStorage.getItem("tenantId");
+    // 白名单
+    const whiteList = [
+      "web/queryTenantById",
+      "screening/createNoToken",
+      "screening/save",
+      "screening/submitNoToken",
+    ];
+    // 判断白名单是否存在当前则携带参数在header
+    if (whiteList.includes(config.url)) {
+      if (localStorage.getItem("tenantId")) {
+        config.headers.TENANT_ID = localStorage.getItem("tenantId");
+      }
     }
     // get请求映射params参数
     if (config.method === "get" && config.params) {
@@ -40,6 +50,7 @@ service.interceptors.request.use(
       config.params = {};
       config.url = url;
     }
+
     if (
       !isRepeatSubmit &&
       (config.method === "post" || config.method === "put")
diff --git a/acupuncture-前台/src/views/medicalFile/details.vue b/acupuncture-前台/src/views/medicalFile/details.vue
index b1eecbd4..afc0256e 100644
--- a/acupuncture-前台/src/views/medicalFile/details.vue
+++ b/acupuncture-前台/src/views/medicalFile/details.vue
@@ -798,10 +798,10 @@ export default {
       habitus: [
         "平和质",
         "气虚质",
-        " 阳虚质",
+        "阳虚质",
         "阴虚质",
         "痰湿质",
-        " 湿热质",
+        "湿热质",
         "血瘀质",
         "气郁质",
         "特禀质",
diff --git a/acupuncture-前台/src/views/medicalFile/index.vue b/acupuncture-前台/src/views/medicalFile/index.vue
index b545b25a..35faeb55 100644
--- a/acupuncture-前台/src/views/medicalFile/index.vue
+++ b/acupuncture-前台/src/views/medicalFile/index.vue
@@ -248,6 +248,16 @@
         show-overflow-tooltip
         min-width="100"
       />
+      <el-table-column
+        label="受教育程度"
+        align="center"
+        show-overflow-tooltip
+        min-width="100"
+      >
+        <template slot-scope="scope">
+          {{ educationYearsValue[scope.row.educationYears] }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="受教育年限"
         align="center"
@@ -490,13 +500,20 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="受教育年限" prop="educationYears">
-          <el-input
-            type="number"
+        <el-form-item label="受教育程度" prop="educationYears">
+          <el-select
             v-model="form.educationYears"
-            placeholder="请输入"
-            :disabled="formDisabled"
-          />
+            placeholder="请选择"
+            filterable
+          >
+            <el-option
+              v-for="item in educationYears"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="手机号码" prop="phone">
           <el-input type="number" v-model="form.phone" placeholder="请输入" />
@@ -626,6 +643,29 @@ export default {
   data() {
     return {
       qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
+      // 受教育程度，年限
+      educationYears: [
+        { label: "文盲", value: 0 },
+        { label: "小学", value: 6 },
+        { label: "初中", value: 9 },
+        { label: "高中", value: 12 },
+        { label: "大专", value: 15 },
+        { label: "大学", value: 16 },
+        { label: "硕士研究生", value: 19 },
+        { label: "博士研究生", value: 22 },
+      ],
+      // 通过年限对象获取学历
+      educationYearsValue: {
+        0: "文盲",
+        6: "小学",
+        9: "初中",
+        12: "高中",
+        15: "大专",
+        16: "大学",
+        19: "硕士研究生",
+        22: "博士研究生",
+      },
+
       // 民族列表
       ethnicityList: [
         { label: "汉族", value: "01" },
@@ -738,392 +778,7 @@ export default {
         3: "台湾居民来往大陆通行证",
         4: "其他",
       },
-      // 体型类型
-      systemType: [
-        "隐形肥胖型",
-        "脂肪过多型",
-        "肥胖型",
-        "肌肉不足型",
-        "健康匀称型",
-        "超重肌肉型",
-        "消瘦型",
-        "低脂肪型",
-        "运动员型",
-      ],
-      // 体质辨识
-      habitus: [
-        "平和质",
-        "气虚质",
-        " 阳虚质",
-        "阴虚质",
-        "痰湿质",
-        " 湿热质",
-        "血瘀质",
-        "气郁质",
-        "特禀质",
-      ],
-      // 治疗类型
-      healType: [
-        {
-          title: "肥胖症",
-          list: [
-            {
-              title: "行为心理干预",
-              valueCode: "ZLFA_XWXLGY",
-              list: [
-                {
-                  title:
-                    "行为技能训练：辅导有效的应对压力技巧，避免因情绪波动导致过度进食，训练正念饮食，提高对饥饿和饱足感的感知能力",
-                  value: "行为技能训练",
-                  type: "but",
-                },
-                {
-                  title:
-                    "目标设定与追踪：与患者共同设立短期和长期减重目标，定期进行进度评估，强化正面反馈，提高自我管理能力",
-                  value: "目标设定与追踪",
-                  type: "but",
-                },
-              ],
-            },
-            {
-              title: "运动干预",
-              valueCode: "ZLFA_YDGY",
-              list: [
-                {
-                  title:
-                    "有氧运动：如快走、慢跑、游泳等，建议每周至少进行150分钟中等强度的有氧运动",
-                  value: "有氧运动",
-                  type: "but",
-                },
-                {
-                  title:
-                    "抗阻运动：如举重、俯卧撑等，建议每周进行2-3次抗阻运动",
-                  value: "抗阻运动",
-                  type: "but",
-                },
-              ],
-            },
-            {
-              title: "临床营养治疗",
-              valueCode: "ZLFA_LCYYZL",
-              list: [
-                {
-                  title:
-                    "限能量饮食：在限制能量摄入（日常饮食能量减去30%）的基础上，营养素比例符合平衡膳食的要求",
-                  value: "限能量饮食",
-                  type: "but",
-                },
-                {
-                  title: "高蛋白饮食：每日蛋白质摄入量超过20%，但一般不高于35%",
-                  value: "高蛋白饮食",
-                  type: "but",
-                },
-                {
-                  title: "低碳水化合物饮食：碳水化合物供能比一般在20%-40%",
-                  value: "低碳水化合物饮食",
-                  type: "but",
-                },
-                {
-                  title:
-                    "断食：如5+2模式，1周中5天相对正常进食，其他2天摄取平常的1/4能量",
-                  value: "断食",
-                  type: "but",
-                },
-              ],
-            },
-            {
-              title: "针灸疗法",
-              list: [
-                {
-                  title: "疗法",
-                  valueCode: "ZLFA_ZJ_LF",
-                  list: [
-                    {
-                      title: "毫针/电针疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "温针疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "耳穴贴压疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "穴位埋针法",
-                      type: "but",
-                    },
-                    {
-                      title: "穴位埋线法",
-                      type: "but",
-                    },
-                  ],
-                },
-                {
-                  title: "穴位",
-                  valueCode: "ZLFA_ZJ_XW",
-                  list: [
-                    {
-                      title: "神门：安神定志，改善睡眠质量",
-                      value: "神门",
-                      type: "but",
-                    },
-                    {
-                      title: "三阴交：调理脾胃，养血安神",
-                      value: "三阴交",
-                      type: "but",
-                    },
-                    {
-                      title: "百会：调节大脑功能，促进睡眠",
-                      value: "百会",
-                      type: "but",
-                    },
-                    {
-                      title: "安眠：直接作用于睡眠中枢，帮助入睡",
-                      value: "安眠",
-                      type: "but",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              title: "药物治疗",
-              valueCode: "ZLFA_YW",
-              list: [
-                {
-                  title: "奥利司他：通过抑制胃肠道脂肪酶，减少脂肪吸收",
-                  value: "奥利司他",
-                  type: "but",
-                },
-                {
-                  title: "利拉鲁肽：GLP-1受体激动剂，延缓胃排空，增加饱腹感",
-                  value: "利拉鲁肽",
-                  type: "but",
-                },
-                {
-                  title: "贝那鲁肽：GLP-1受体激动剂，作用机制与利拉鲁肽类似",
-                  value: "贝那鲁肽",
-                  type: "but",
-                },
-                {
-                  title:
-                    "司美格鲁肽：GLP-1受体激动剂，每周一次给药，减重效果显著",
-                  value: "司美格鲁肽",
-                  type: "but",
-                },
-                {
-                  title: "替尔泊肽：GLP-1受体激动剂，适用于肥胖症治疗",
-                  value: "替尔泊肽",
-                  type: "but",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          title: "失眠症",
-          list: [
-            {
-              title: "生活习惯",
-              valueCode: "ZLFA_SHXG",
-              list: [
-                {
-                  title:
-                    "科学膳食：避免午后摄入咖啡、茶、酒精等刺激性饮品，以及睡前过度进食",
-                  value: "科学膳食",
-                  type: "but",
-                },
-                {
-                  title:
-                    "充足日照：增加日间自然光照，减少夜间人工光源，特别是电子产品的使用",
-                  value: "充足日照",
-                  type: "but",
-                },
-                {
-                  title:
-                    "合理运动：推荐瑜伽、太极拳、八段锦等传统运动，有助于改善睡眠质量",
-                  value: "合理运动",
-                  type: "but",
-                },
-              ],
-            },
-            {
-              title: "心理调适",
-              valueCode: "ZLFA_XLTS",
-              list: [
-                {
-                  title:
-                    "放松训练：包括渐进式肌肉放松训练、腹式呼吸、冥想等，可降低紧张与过度警觉，提高睡眠质量",
-                  value: "放松训练",
-                  type: "but",
-                },
-                {
-                  title:
-                    "音乐疗法：轻柔舒缓的音乐可以降低神经系统兴奋性，减轻焦虑情绪从而改善睡眠",
-                  value: "音乐疗法",
-                  type: "but",
-                },
-                {
-                  title:
-                    "认知调整：不灾难化和过分关注失眠，不因偶尔失眠而产生挫败感，培养失眠的耐受性",
-                  value: "认知调整",
-                  type: "but",
-                },
-              ],
-            },
-            {
-              title: "针灸疗法",
-              list: [
-                {
-                  title: "疗法",
-                  valueCode: "ZLFA_ZJ_LF_SMZ",
-                  list: [
-                    {
-                      title: "毫针/电针疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "温针疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "耳穴贴压疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "穴位埋针法",
-                      type: "but",
-                    },
-                    {
-                      title: "穴位埋线法",
-                      type: "but",
-                    },
-                  ],
-                },
-                {
-                  title: "穴位",
-                  valueCode: "ZLFA_ZJ_XW_SMZ",
-                  list: [
-                    {
-                      title: "神门：安神定志，改善睡眠质量",
-                      value: "神门",
-                      type: "but",
-                    },
-                    {
-                      title: "三阴交：调理脾胃，养血安神",
-                      value: "三阴交",
-                      type: "but",
-                    },
-                    {
-                      title: "百会：调节大脑功能，促进睡眠",
-                      value: "百会",
-                      type: "but",
-                    },
-                    {
-                      title: "安眠：直接作用于睡眠中枢，帮助入睡",
-                      value: "安眠",
-                      type: "but",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              title: "药物治疗",
-              valueCode: "ZLFA_YW_SMZ",
-              list: [
-                {
-                  title:
-                    "苯二氮䓬受体激动剂（BZRAs）：艾司唑仑、阿普唑仑、劳拉西泮等",
-                  value: "苯二氮䓬受体激动剂（BZRAs）",
-                  type: "but",
-                },
-                {
-                  title:
-                    "非苯二氮䓬类药物（non-BZDs）：唑吡坦、扎来普隆、右佐匹克隆、佐匹克隆",
-                  value: "非苯二氮䓬类药物（non-BZDs）",
-                  type: "but",
-                },
-                {
-                  title: "褪黑素和褪黑素受体激动剂：调节生物钟，改善睡眠",
-                  value: "褪黑素和褪黑素受体激动剂",
-                  type: "but",
-                },
-                {
-                  title:
-                    "抗抑郁药物：具有镇静作用的抗抑郁药物，如曲唑酮、米氮平等，可用于失眠伴抑郁症状的患者",
-                  value: "抗抑郁药物",
-                  type: "but",
-                },
-                {
-                  title:
-                    "其他药物：选择性食欲素受体拮抗剂苏沃雷生，可用于改善睡眠质量",
-                  value: "其他药物",
-                  type: "but",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          title: "其他",
-          list: [
-            {
-              title: "针灸疗法",
-              list: [
-                {
-                  title: "疗法",
-                  valueCode: "ZLFA_ZJ_LF_QT",
-                  list: [
-                    {
-                      title: "毫针/电针疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "温针疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "耳穴贴压疗法",
-                      type: "but",
-                    },
-                    {
-                      title: "穴位埋针法",
-                      type: "but",
-                    },
-                    {
-                      title: "穴位埋线法",
-                      type: "but",
-                    },
-                  ],
-                },
-                {
-                  title: "穴位",
-                  valueCode: "ZLFA_ZJ_XW_QT",
-                  list: [
-                    {
-                      title: "填写",
-                      type: "input",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              title: "药物治疗",
-              valueCode: "ZLFA_YW_QT",
-              list: [
-                {
-                  title: "填写",
-                  type: "input",
-                },
-              ],
-            },
-          ],
-        },
-      ],
+
       status: {
         0: "保存",
         1: "待审核",
diff --git a/acupuncture-前台/src/views/patientFile/index.vue b/acupuncture-前台/src/views/patientFile/index.vue
index 5b61f5d6..5aa1b59b 100644
--- a/acupuncture-前台/src/views/patientFile/index.vue
+++ b/acupuncture-前台/src/views/patientFile/index.vue
@@ -169,6 +169,16 @@
         show-overflow-tooltip
         min-width="100"
       />
+      <el-table-column
+        label="受教育程度"
+        align="center"
+        show-overflow-tooltip
+        min-width="100"
+      >
+        <template slot-scope="scope">
+          {{ educationYearsValue[scope.row.educationYears] }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="受教育年限"
         align="center"
@@ -334,13 +344,20 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="受教育年限" prop="educationYears">
-          <el-input
-            type="number"
+        <el-form-item label="受教育程度" prop="educationYears">
+          <el-select
             v-model="form.educationYears"
-            placeholder="请输入"
-            :disabled="formDisabled"
-          />
+            placeholder="请选择"
+            filterable
+          >
+            <el-option
+              v-for="item in educationYears"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="手机号码" prop="phone">
           <el-input
@@ -448,6 +465,28 @@ export default {
       uploadFileUrl1:
         process.env.VUE_APP_API_QZURL + "/acupuncture/patient/import", // 上传的图片服务器地址
       fileList: [],
+      // 受教育程度，年限
+      educationYears: [
+        { label: "文盲", value: 0 },
+        { label: "小学", value: 6 },
+        { label: "初中", value: 9 },
+        { label: "高中", value: 12 },
+        { label: "大专", value: 15 },
+        { label: "大学", value: 16 },
+        { label: "硕士研究生", value: 19 },
+        { label: "博士研究生", value: 22 },
+      ],
+      // 通过年限对象获取学历
+      educationYearsValue: {
+        0: "文盲",
+        6: "小学",
+        9: "初中",
+        12: "高中",
+        15: "大专",
+        16: "大学",
+        19: "硕士研究生",
+        22: "博士研究生",
+      },
       // 民族列表
       ethnicityList: [
         { label: "汉族", value: "01" },
diff --git a/acupuncture-后台/src/views/medicalFile/details.vue b/acupuncture-后台/src/views/medicalFile/details.vue
index 65205ab9..3144fbdc 100644
--- a/acupuncture-后台/src/views/medicalFile/details.vue
+++ b/acupuncture-后台/src/views/medicalFile/details.vue
@@ -798,10 +798,10 @@ export default {
       habitus: [
         "平和质",
         "气虚质",
-        " 阳虚质",
+        "阳虚质",
         "阴虚质",
         "痰湿质",
-        " 湿热质",
+        "湿热质",
         "血瘀质",
         "气郁质",
         "特禀质",
diff --git a/acupuncture-后台/src/views/medicalFile/index.vue b/acupuncture-后台/src/views/medicalFile/index.vue
index 8dcb3c77..aa8fce88 100644
--- a/acupuncture-后台/src/views/medicalFile/index.vue
+++ b/acupuncture-后台/src/views/medicalFile/index.vue
@@ -267,6 +267,16 @@
         show-overflow-tooltip
         min-width="100"
       />
+      <el-table-column
+        label="受教育程度"
+        align="center"
+        show-overflow-tooltip
+        min-width="100"
+      >
+        <template slot-scope="scope">
+          {{ educationYearsValue[scope.row.educationYears] }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="受教育年限"
         align="center"
@@ -516,6 +526,7 @@
             </el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item label="受教育年限" prop="educationYears">
           <el-input
             type="number"
@@ -654,6 +665,17 @@ export default {
     return {
       tenantsListData: [],
       qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
+      // 通过年限对象获取学历
+      educationYearsValue: {
+        0: "文盲",
+        6: "小学",
+        9: "初中",
+        12: "高中",
+        15: "大专",
+        16: "大学",
+        19: "硕士研究生",
+        22: "博士研究生",
+      },
       // 民族列表
       ethnicityList: [
         { label: "汉族", value: "01" },
diff --git a/acupuncture-后台/src/views/patientFile/index.vue b/acupuncture-后台/src/views/patientFile/index.vue
index 04f9772e..d12b3dde 100644
--- a/acupuncture-后台/src/views/patientFile/index.vue
+++ b/acupuncture-后台/src/views/patientFile/index.vue
@@ -45,7 +45,7 @@
           <el-option label="HIS" :value="2" />
         </el-select>
       </el-form-item>
-      
+
       <el-form-item label="建档组织" prop="tenantId">
         <el-select
           v-model="queryParams.param.tenantId"
@@ -149,6 +149,16 @@
         show-overflow-tooltip
         min-width="100"
       />
+      <el-table-column
+        label="受教育程度"
+        align="center"
+        show-overflow-tooltip
+        min-width="100"
+      >
+        <template slot-scope="scope">
+          {{ educationYearsValue[scope.row.educationYears] }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="受教育年限"
         align="center"
@@ -405,6 +415,17 @@ export default {
       uploadFileUrl1:
         process.env.VUE_APP_API_QZURL + "/acupuncture/patient/import", // 上传的图片服务器地址
       fileList: [],
+      // 通过年限对象获取学历
+      educationYearsValue: {
+        0: "文盲",
+        6: "小学",
+        9: "初中",
+        12: "高中",
+        15: "大专",
+        16: "大学",
+        19: "硕士研究生",
+        22: "博士研究生",
+      },
       // 现病史
       medicalHistory: [
         "高血压",