diff --git a/acupuncture-后台/src/views/medicalFile/index.vue b/acupuncture-后台/src/views/medicalFile/index.vue
index 04438cd4..d7450a5b 100644
--- a/acupuncture-后台/src/views/medicalFile/index.vue
+++ b/acupuncture-后台/src/views/medicalFile/index.vue
@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="80px"
+      label-width="100px"
     >
       <el-form-item label="" prop="noticeTitle">
         <el-input
@@ -93,7 +93,23 @@
           <el-option label="驳回" :value="3" />
         </el-select>
       </el-form-item>
-      <el-form-item label="建档组织" prop="tenantId">
+      <el-form-item label="上报标题" prop="managementId">
+        <el-select
+          v-model="queryParams.param.managementId"
+          placeholder="请选择"
+          filterable
+          clearable
+        >
+          <el-option
+            v-for="item in managerList"
+            :key="item.id"
+            :label="item.reportTitle"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上报单位" prop="tenantId">
         <el-select
           v-model="queryParams.param.tenantId"
           placeholder="请选择"
@@ -108,6 +124,17 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="门诊/住院时间" prop="time">
+        <el-date-picker
+          v-model="time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -359,9 +386,24 @@
           </span>
         </template>
       </el-table-column>
-
       <el-table-column
-        label="建档人"
+        label="上报标题"
+        align="center"
+        prop="managementId"
+        show-overflow-tooltip
+        min-width="150"
+      >
+        <template slot-scope="scope">
+          <!-- managerList 找到匹配项回显名称 -->
+          <span v-for="item in managerList" :key="item.id">
+            <span v-if="item.id == scope.row.managementId">
+              {{ item.reportTitle }}
+            </span>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="上报人"
         align="center"
         prop="createBy"
         show-overflow-tooltip
@@ -369,7 +411,7 @@
       />
       <el-table-column
         prop="tenantName"
-        label="建档组织"
+        label="上报单位"
         align="center"
         show-overflow-tooltip
         min-width="150"
@@ -662,6 +704,7 @@ import {
   queueAdd,
   exportTreatmentPg,
 } from "@/api/medicalFile";
+import { managerQuery } from "@/api/report";
 import { tenantsList } from "@/api/member";
 import { getToken } from "@/utils/auth";
 import { followupQuery } from "@/api/followupFile";
@@ -670,6 +713,8 @@ export default {
   dicts: ["sys_normal_disable", "sys_user_sex"],
   data() {
     return {
+      time: [],
+      managerList: [], // 管理员列表
       tenantsListData: [],
       qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
       // 通过年限对象获取学历
@@ -755,16 +800,6 @@ export default {
       fileList: [],
       followupList: [],
       queueOpen: false,
-      // 现病史
-      medicalHistory: [
-        "肥胖症",
-        "失眠病",
-        "中风病",
-        "面瘫病",
-        "项痹病",
-        "腰痛病",
-        "痉挛性斜颈",
-      ],
       idCardType: [
         {
           label: "身份证",
@@ -794,392 +829,6 @@ 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: "待审核",
@@ -1213,6 +862,9 @@ export default {
           doctor: "",
           status: "",
           tenantId: "",
+          managementId: "",
+          startTime: "",
+          endTime: "",
         },
       },
       formDisabled: false,
@@ -1367,13 +1019,24 @@ export default {
     };
   },
   created() {
-    let { name, phone } = this.$route.query;
-    this.queryParams.param.keywords = name || "";
-    this.queryParams.param.phone = phone !== 'null' ? phone : "";
+    let { name, phone, managementId } = this.$route.query;
+    this.queryParams.param.keywords = name;
+    this.queryParams.param.phone = phone !== "null" ? phone : "";
+    this.queryParams.param.managementId = managementId;
     this.getList();
     this.getTenantsList(); // 组织列表
+    this.getManagerList(); // 上报管理列表
   },
   methods: {
+    /** 上报管理列表 */
+    getManagerList() {
+      managerQuery({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.managerList = res.data.list;
+      });
+    },
     // 组织列表
     getTenantsList() {
       tenantsList({
@@ -1470,6 +1133,14 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      // 处理time，拼接时分秒，开始时间 + 00:00:00，结束时间 + 23:59:59
+      if (this.time?.length > 0) {
+        this.queryParams.param.startTime = this.time[0] + " 00:00:00";
+        this.queryParams.param.endTime = this.time[1] + " 23:59:59";
+      } else {
+        this.queryParams.param.startTime = "";
+        this.queryParams.param.endTime = "";
+      }
       this.getList();
     },
     /** 重置按钮操作 */
@@ -1485,6 +1156,8 @@ export default {
         endAge: "",
         doctor: "",
         status: "",
+        tenantId: "",
+        managementId: "",
       };
       this.handleQuery();
     },
@@ -1636,35 +1309,6 @@ export default {
         }
       });
     },
-    // 诊疗详情
-    submitDetailsForm: function () {
-      this.$refs["detailsForm"].validate((valid) => {
-        if (valid) {
-          let codeAndAnswerList = [];
-          for (let key in this.detailsForm) {
-            let data = {
-              questionCode: key,
-              answer: "",
-            };
-            if (typeof this.detailsForm[key] === "string") {
-              data.answer = this.detailsForm[key].split(",");
-            } else {
-              data.answer = this.detailsForm[key];
-            }
-            codeAndAnswerList.push(data);
-          }
-
-          saveAidRecord({
-            treatmentId: this.form.id,
-            codeAndAnswerList,
-          }).then((response) => {
-            this.$modal.msgSuccess("保存成功");
-            this.drawer = false;
-            this.getList();
-          });
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const idList = row.id ? [row.id] : this.ids;
diff --git a/acupuncture-后台/src/views/report/manage.vue b/acupuncture-后台/src/views/report/manage.vue
index b0f0bea5..46bb0d5e 100644
--- a/acupuncture-后台/src/views/report/manage.vue
+++ b/acupuncture-后台/src/views/report/manage.vue
@@ -395,7 +395,7 @@ export default {
     handleDetails(row) {
       this.$router.push({
         path: "/medicalFile/index",
-        query: { id: row.id },
+        query: { managementId: row.id },
       });
     },
     // 获取上报类型切换处理