diff --git a/acupuncture-ui/src/api/followupFile.js b/acupuncture-ui/src/api/followupFile.js
new file mode 100644
index 00000000..a1f3e170
--- /dev/null
+++ b/acupuncture-ui/src/api/followupFile.js
@@ -0,0 +1,59 @@
+import request from "@/utils/request";
+
+// 随访队列
+export function followupQuery(data) {
+  return request({
+    url: "/followup/query",
+    method: "post",
+    data: data,
+  });
+}
+// 新增随访队列
+export function followupAdd(data) {
+  return request({
+    url: "/followup/add",
+    method: "post",
+    data: data,
+  });
+}
+// 新增随访队列
+export function followupUpd(data) {
+  return request({
+    url: "/followup/upd",
+    method: "post",
+    data: data,
+  });
+}
+// 新增随访队列
+export function followupDel(data) {
+  return request({
+    url: "/followup/del",
+    method: "post",
+    data: data,
+  });
+}
+// ----随访对象----
+// 查看随访对象
+export function queryPatient(data) {
+  return request({
+    url: "/followup/queryPatient",
+    method: "post",
+    data: data,
+  });
+}
+// 修改随访对象 队列信息
+export function updPatient(data) {
+  return request({
+    url: "/followup/updPatient",
+    method: "post",
+    data: data,
+  });
+}
+// 随访工单
+export function queryTask(data) {
+  return request({
+    url: "/followup/queryTask",
+    method: "post",
+    data: data,
+  });
+}
\ No newline at end of file
diff --git a/acupuncture-ui/src/router/index.js b/acupuncture-ui/src/router/index.js
index becfbe3d..b56bf93f 100644
--- a/acupuncture-ui/src/router/index.js
+++ b/acupuncture-ui/src/router/index.js
@@ -83,20 +83,46 @@ export const constantRoutes = [
         path: "/patientIndex",
         component: () => import("@/views/patientFile/index"),
         name: "Index",
-        meta: { title: "患者档案", icon: "dashboard", affix: true },
+        meta: { title: "患者档案", icon: "dashboard", },
       },
     ],
   },
   {
     path: "/medicalFile",
     component: Layout,
-    redirect: "index",
+    redirect: "medicalFile",
     children: [
       {
         path: "/medicalIndex",
         component: () => import("@/views/medicalFile/index"),
-        name: "Index",
-        meta: { title: "诊疗档案", icon: "dashboard", affix: true },
+        name: "medicalIndex",
+        meta: { title: "诊疗档案", icon: "dashboard", },
+      },
+    ],
+  },
+  {
+    path: "/followFile",
+    meta: { title: "随访档案", icon: "dashboard", },
+    component: Layout,
+    redirect: "followFile",
+    children: [
+      {
+        path: "/followIndex",
+        component: () => import("@/views/followFile/index"),
+        name: "followIndex",
+        meta: { title: "随访队列", icon: "dashboard", },
+      },
+      {
+        path: "/followSubjects",
+        component: () => import("@/views/followFile/subjects"),
+        name: "followSubjects",
+        meta: { title: "随访对象", icon: "dashboard", },
+      },
+      {
+        path: "/followWork",
+        component: () => import("@/views/followFile/work"),
+        name: "followWork",
+        meta: { title: "随访工单", icon: "dashboard", },
       },
     ],
   },
diff --git a/acupuncture-ui/src/views/followFile/index.vue b/acupuncture-ui/src/views/followFile/index.vue
new file mode 100644
index 00000000..cdb839c3
--- /dev/null
+++ b/acupuncture-ui/src/views/followFile/index.vue
@@ -0,0 +1,439 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="队列名称" prop="name">
+        <el-input
+          v-model="queryParams.param.name"
+          placeholder="请输入"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          >删除</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="listDat"
+      @selection-change="handleSelectionChange"
+      max-height="600"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="队列名称"
+        align="center"
+        prop="name"
+        width="100"
+      />
+      <el-table-column
+        label="随访方式"
+        align="center"
+        prop="followupMethod"
+        show-overflow-tooltip
+        width="100"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.followupMethod == 0">电话随访</span>
+          <span v-if="scope.row.followupMethod == 1">入户随访</span>
+          <span v-if="scope.row.followupMethod == 2">到院随访</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="随访类型"
+        align="center"
+        show-overflow-tooltip
+        width="150"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.followupType == 0">单次</span>
+          <span v-if="scope.row.followupType == 1">周期</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="随访频次"
+        align="center"
+        prop="frequency"
+        show-overflow-tooltip
+        width="100"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        show-overflow-tooltip
+        width="100"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 0">禁用</span>
+          <span v-if="scope.row.status == 1">启用</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建人"
+        align="center"
+        prop="createBy"
+        show-overflow-tooltip
+        width="100"
+      />
+      <el-table-column label="创建时间" align="center" width="130">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" align="center" width="150">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公告对话框 -->
+    <el-dialog
+      class="popup"
+      :title="title"
+      :visible.sync="open"
+      width="780px"
+      append-to-body
+    >
+      <el-form
+        class="formStep"
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="90px"
+      >
+        <el-form-item label="队列名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入" />
+        </el-form-item>
+
+        <el-form-item label="随访方式" prop="followupMethod">
+          <el-select v-model="form.followupMethod" placeholder="请选择">
+            <el-option label="电话随访" :value="0"> </el-option>
+            <el-option label="电话随访" :value="1"> </el-option>
+            <el-option label="电话随访" :value="2"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="随访类型" prop="followupType">
+          <el-radio-group v-model="form.followupType">
+            <el-radio :label="0">单次</el-radio>
+            <el-radio :label="1">周期</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="随访频次" prop="frequency">
+          <el-input v-model="form.frequency" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio :label="0">禁用</el-radio>
+            <el-radio :label="1">启用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  followupQuery,
+  followupAdd,
+  followupUpd,
+  followupDel,
+} from "@/api/followupFile";
+export default {
+  name: "Notice",
+  data() {
+    return {
+      idCardType: [
+        {
+          label: "身份证",
+          value: 0,
+        },
+        {
+          label: "护照或外国人永居证",
+          value: 1,
+        },
+        {
+          label: "港澳居民来往内地通行",
+          value: 2,
+        },
+        {
+          label: "台湾居民来往大陆通行证",
+          value: 3,
+        },
+      ],
+      idCardTypeValue: {
+        0: "身份证",
+        1: "护照或外国人永居证",
+        2: "港澳居民来往内地通行",
+        3: "台湾居民来往大陆通行证",
+      },
+      loading: false, // 遮罩层
+      ids: [], // 选中数组
+      single: true, // 非单个禁用
+      multiple: true, // 非多个禁用
+      showSearch: true, // 显示搜索条件
+      total: 0, // 总条数
+      listDat: [{}], // 公告表格数据
+      title: "", // 弹出层标题
+      open: false, // 是否显示弹出层
+      importOpen: false, // 导入弹窗
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        param: {
+          name: "", //关键字
+        },
+      },
+      formDisabled: false,
+      importform: {},
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "患者姓名不能为空", trigger: "blur" },
+        ],
+        gender: [
+          { required: true, message: "性别不能为空", trigger: "change" },
+        ],
+        phone: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+        ],
+        ethnicity: [
+          { required: true, message: "民族不能为空", trigger: "blur" },
+        ],
+        idCardType: [
+          { required: true, message: "证件类型不能为空", trigger: "blur" },
+        ],
+        idCard: [
+          { required: true, message: "证件号码不能为空", trigger: "blur" },
+        ],
+        currentIllnessHistory: [
+          {
+            required: true,
+            message: "现病史不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true;
+      followupQuery(this.queryParams).then((res) => {
+        this.listDat = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        name: "", // 姓名
+        gender: 0, // 性别
+        birthDate: "", // 出生日期
+        ethnicity: "", // 民族
+        educationYears: "", // 教育程度
+        phone: "", // 联系电话
+        idCardType: "", // 证件类型
+        idCard: "", // 证件号码
+        currentIllnessHistory: [], // 现病史
+        currentIllnessHistoryQT: "", // 现病史
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增患者档案";
+      this.formDisabled = false;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.open = true;
+      this.title = "修改患者档案";
+      this.formDisabled = false;
+      this.form = JSON.parse(JSON.stringify(row));
+      // 字符串转数组
+      this.form.currentIllnessHistory =
+        this.form.currentIllnessHistory.split(",");
+    },
+    /** 详情按钮操作 */
+    handleDetails(row) {
+      this.open = true;
+      this.title = "患者档案详情";
+      this.formDisabled = true;
+      this.form = JSON.parse(JSON.stringify(row));
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            patientUpd(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            patientAdd(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const idList = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除当前选择的患者数据？")
+        .then(function () {
+          return followupDel({ idList: idList });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/user/export",
+        {
+          ...this.queryParams.params,
+        },
+        `患者档案.xlsx`
+      );
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+  },
+};
+</script>
+<style scoped src="@/assets/styles/common.css"></style>
+<style scoped>
+.form-item-age {
+  display: flex;
+  align-items: center;
+}
+.form-item-age span {
+  margin: 0 10px;
+}
+.form-item-age >>> .el-input {
+  width: 100px;
+}
+</style>
+<!-- >>> .el-input__inner {
+  padding: 0 15px !important;
+} -->
diff --git a/acupuncture-ui/src/views/followFile/subjects.vue b/acupuncture-ui/src/views/followFile/subjects.vue
new file mode 100644
index 00000000..53b68ea0
--- /dev/null
+++ b/acupuncture-ui/src/views/followFile/subjects.vue
@@ -0,0 +1,398 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="随访队列" prop="sourceId">
+        <el-select
+          v-model="queryParams.param.sourceId"
+          placeholder="请选择"
+          clearable
+        >
+          <el-option label="筛查" :value="0" />
+          <el-option label="录入" :value="1" />
+          <el-option label="HIS" :value="2" />
+        </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="listDat"
+      @selection-change="handleSelectionChange"
+      max-height="600"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="name" width="100" />
+      <el-table-column
+        label="性别"
+        align="center"
+        prop="gender"
+        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>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="出生日期"
+        align="center"
+        prop="birthDate"
+        show-overflow-tooltip
+        width="150"
+      >
+        <template slot-scope="scope">
+          {{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}
+        </template>
+      </el-table-column>
+      <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
+        fixed="right"
+        label="随访队列"
+        align="center"
+        prop="queueList"
+        show-overflow-tooltip
+        width="180"
+      >
+        <template slot-scope="scope">
+          <div v-if="scope.row.queueList && scope.row.queueList.length">
+            {{ scope.row.queueList.map((i) => i.queueName).join(",") }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建人/创建时间"
+        align="center"
+        width="130"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.createBy }}</div>
+          <span>{{
+            parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >队列管理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="handlePatient(scope.row)"
+            >患者档案</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-notebook-2"
+            @click="handleMedical(scope.row)"
+            >诊疗档案</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公告对话框 -->
+    <el-dialog
+      class="popup"
+      :title="title"
+      :visible.sync="open"
+      width="780px"
+      append-to-body
+    >
+      <el-form
+        class="formStep"
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="90px"
+      >
+        <el-form-item label="随访队列" prop="gender">
+          <el-select v-model="form.queueIdList" multiple placeholder="请选择">
+            <el-option
+              v-for="item in followupList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { queryPatient, followupQuery, updPatient } from "@/api/followupFile";
+export default {
+  name: "Notice",
+  data() {
+    return {
+      fileList: [],
+      idCardType: [
+        {
+          label: "身份证",
+          value: 0,
+        },
+        {
+          label: "护照或外国人永居证",
+          value: 1,
+        },
+        {
+          label: "港澳居民来往内地通行",
+          value: 2,
+        },
+        {
+          label: "台湾居民来往大陆通行证",
+          value: 3,
+        },
+      ],
+      idCardTypeValue: {
+        0: "身份证",
+        1: "护照或外国人永居证",
+        2: "港澳居民来往内地通行",
+        3: "台湾居民来往大陆通行证",
+      },
+      loading: false, // 遮罩层
+      ids: [], // 选中数组
+      single: true, // 非单个禁用
+      multiple: true, // 非多个禁用
+      showSearch: true, // 显示搜索条件
+      total: 0, // 总条数
+      listDat: [{}], // 公告表格数据
+      title: "", // 弹出层标题
+      open: false, // 是否显示弹出层
+      importOpen: false, // 导入弹窗
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        param: {},
+      },
+      formDisabled: false,
+      importform: {},
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "患者姓名不能为空", trigger: "blur" },
+        ],
+      },
+      followupList: [], // 随访队列
+    };
+  },
+  created() {
+    this.getList();
+    this.getFollowupQuery();
+  },
+  methods: {
+    // 获取随访队列信息
+    getFollowupQuery() {
+      followupQuery({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.followupList = res.data.list;
+      });
+    },
+
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true;
+      queryPatient(this.queryParams).then((res) => {
+        this.listDat = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.open = true;
+      this.title = "队列管理";
+      let queueList = row.queueList.map((item) => item.queueId);
+      this.form = JSON.parse(
+        JSON.stringify({
+          ...row,
+          patientId: row.id,
+          queueIdList: queueList,
+        })
+      );
+    },
+    /** 跳转患者档案 */
+    handlePatient(row) {},
+    /** 诊疗档案 */
+    handleMedical(row) {},
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          updPatient(this.form).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const idList = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除当前选择的患者数据？")
+        .then(function () {
+          return patientDel({ idList: idList });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/user/export",
+        {
+          ...this.queryParams.params,
+        },
+        `患者档案.xlsx`
+      );
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+  },
+};
+</script>
+<style scoped src="@/assets/styles/common.css"></style>
+<style scoped>
+.form-item-age {
+  display: flex;
+  align-items: center;
+}
+.form-item-age span {
+  margin: 0 10px;
+}
+.form-item-age >>> .el-input {
+  width: 100px;
+}
+</style>
+<!-- >>> .el-input__inner {
+  padding: 0 15px !important;
+} -->
diff --git a/acupuncture-ui/src/views/followFile/work.vue b/acupuncture-ui/src/views/followFile/work.vue
new file mode 100644
index 00000000..371fbb33
--- /dev/null
+++ b/acupuncture-ui/src/views/followFile/work.vue
@@ -0,0 +1,399 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="待随访" name="first"></el-tab-pane>
+      <el-tab-pane label="已随访" name="second"></el-tab-pane>
+      <el-tab-pane label="失访" name="third"></el-tab-pane>
+    </el-tabs>
+    <el-table
+      v-loading="loading"
+      :data="listDat"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="name" width="100" />
+      <el-table-column
+        label="性别"
+        align="center"
+        prop="gender"
+        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>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="出生日期"
+        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"
+        prop="createBy"
+        show-overflow-tooltip
+        width="100"
+      />
+      <el-table-column
+        label="建档组织（医院名称）"
+        align="center"
+        prop="organization"
+        show-overflow-tooltip
+        width="150"
+      />
+      <el-table-column label="建档日期" align="center" width="130">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        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="操作" align="center" width="150">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="handleDetails(scope.row)"
+            >详情</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-notebook-2"
+            @click="handleDelete(scope.row)"
+            >诊疗档案</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公告对话框 -->
+    <el-dialog
+      class="popup"
+      :title="title"
+      :visible.sync="open"
+      width="780px"
+      append-to-body
+    >
+      <el-form
+        class="formStep"
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="90px"
+      >
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+import { queryTask } from "@/api/followupFile";
+export default {
+  name: "Notice",
+  dicts: ["sys_notice_status", "sys_notice_type"],
+  data() {
+    return {
+      activeName: "",
+      headers: {
+        Authorization: "Bearer " + getToken(),
+        deptId: localStorage.getItem("hospitalId"),
+      },
+      uploadFileUrl1: process.env.VUE_APP_BASE_API + "/pms/importTjbgZip", // 上传的图片服务器地址
+      fileList: [],
+      idCardType: [
+        {
+          label: "身份证",
+          value: 0,
+        },
+        {
+          label: "护照或外国人永居证",
+          value: 1,
+        },
+        {
+          label: "港澳居民来往内地通行",
+          value: 2,
+        },
+        {
+          label: "台湾居民来往大陆通行证",
+          value: 3,
+        },
+      ],
+      idCardTypeValue: {
+        0: "身份证",
+        1: "护照或外国人永居证",
+        2: "港澳居民来往内地通行",
+        3: "台湾居民来往大陆通行证",
+      },
+      loading: false, // 遮罩层
+      ids: [], // 选中数组
+      single: true, // 非单个禁用
+      multiple: true, // 非多个禁用
+      showSearch: true, // 显示搜索条件
+      total: 0, // 总条数
+      listDat: [{}], // 公告表格数据
+      title: "", // 弹出层标题
+      open: false, // 是否显示弹出层
+      importOpen: false, // 导入弹窗
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        param: {
+          keywords: "", //关键字
+        },
+      },
+      formDisabled: false,
+      importform: {},
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "患者姓名不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true;
+      queryTask(this.queryParams).then((res) => {
+        this.listDat = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        name: "", // 姓名
+        gender: 0, // 性别
+        birthDate: "", // 出生日期
+        ethnicity: "", // 民族
+        educationYears: "", // 教育程度
+        phone: "", // 联系电话
+        idCardType: "", // 证件类型
+        idCard: "", // 证件号码
+        currentIllnessHistory: [], // 现病史
+        currentIllnessHistoryQT: "", // 现病史
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增患者档案";
+      this.formDisabled = false;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.open = true;
+      this.title = "修改患者档案";
+      this.formDisabled = false;
+      this.form = JSON.parse(JSON.stringify(row));
+      // 字符串转数组
+      this.form.currentIllnessHistory =
+        this.form.currentIllnessHistory.split(",");
+    },
+    /** 详情按钮操作 */
+    handleDetails(row) {
+      this.open = true;
+      this.title = "患者档案详情";
+      this.formDisabled = true;
+      this.form = JSON.parse(JSON.stringify(row));
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            patientUpd(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            patientAdd(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const idList = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除当前选择的患者数据？")
+        .then(function () {
+          return patientDel({ idList: idList });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/user/export",
+        {
+          ...this.queryParams.params,
+        },
+        `患者档案.xlsx`
+      );
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+  },
+};
+</script>
+<style scoped src="@/assets/styles/common.css"></style>
+<style scoped>
+.form-item-age {
+  display: flex;
+  align-items: center;
+}
+.form-item-age span {
+  margin: 0 10px;
+}
+.form-item-age >>> .el-input {
+  width: 100px;
+}
+</style>
+<!-- >>> .el-input__inner {
+  padding: 0 15px !important;
+} -->
diff --git a/acupuncture-ui/src/views/medicalFile/index.vue b/acupuncture-ui/src/views/medicalFile/index.vue
index 4e4d95f3..991f51a8 100644
--- a/acupuncture-ui/src/views/medicalFile/index.vue
+++ b/acupuncture-ui/src/views/medicalFile/index.vue
@@ -166,6 +166,7 @@
       v-loading="loading"
       :data="listDat"
       @selection-change="handleSelectionChange"
+      max-height="600"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="姓名" align="center" prop="name" width="100" />
@@ -261,7 +262,9 @@
       />
       <el-table-column label="建档时间" align="center" width="130">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          <span>{{
+            parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -1485,7 +1488,6 @@ export default {
         visitTime: "",
         dischargeTime: "",
         doctor: "",
-        status: 0,
       };
       this.resetForm("form");
     },
diff --git a/acupuncture-ui/src/views/patientFile/index.vue b/acupuncture-ui/src/views/patientFile/index.vue
index c4a139f7..fa6f6469 100644
--- a/acupuncture-ui/src/views/patientFile/index.vue
+++ b/acupuncture-ui/src/views/patientFile/index.vue
@@ -130,6 +130,7 @@
       v-loading="loading"
       :data="listDat"
       @selection-change="handleSelectionChange"
+      max-height="600"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="姓名" align="center" prop="name" width="100" />
@@ -209,7 +210,9 @@
       />
       <el-table-column label="建档日期" align="center" width="130">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          <span>{{
+            parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -298,7 +301,7 @@
         </el-form-item>
         <el-form-item label="出生年月" prop="birthDate">
           <el-date-picker
-		  :disabled="formDisabled"
+            :disabled="formDisabled"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             v-model="form.birthDate"