diff --git a/public/index.html b/public/index.html
index 58312d7f559f4850341cd168997fa5389a1527e1..8cca98be2ebdeb1eddce90fcb9fdcbf3f9ec7c03 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <!-- <link rel="icon" href="./favicon.ico"> -->
-  <title>病患溯源管理系统</title>
+  <title>疫情通</title>
   <!----GIS-----start----->
   <!-- ts-gis & tsemap css -->
   <!-- <link rel="stylesheet" href="deps/gis-lib/ol/ol.css" />
diff --git a/src/api/feature/diseaseInfoServer.ts b/src/api/feature/diseaseInfoServer.ts
index 2c2f43e4e667ac0628620593907106fe3625d815..196a7b91e4f5eb64d5a9ec00ef8e2a5f0617f538 100644
--- a/src/api/feature/diseaseInfoServer.ts
+++ b/src/api/feature/diseaseInfoServer.ts
@@ -238,4 +238,25 @@ export class DiseaseInfoServer {
     const url = `infection/info/suffererinfo/detail?idNo=${id}`;
     return this.rSerivce.serverObj.get(url);
   }
+
+  // 核酸检测列表
+  public getNucleicList(dto: any) {
+    const url = `infection/nucleic/detection/list`;
+    return this.rSerivce.serverObj.post(url, dto);
+  }
+  // 核酸检测检测结果下拉列表
+  public getResultTypeList() {
+    const url = `infection/nucleic/detection/findListByDetectionResult`;
+    return this.rSerivce.serverObj.get(url);
+  }
+  // 核酸检测单位类型下拉列表
+  public getIsolationTypeist() {
+    const url = `infection/nucleic/detection/findListByIsolationType`;
+    return this.rSerivce.serverObj.get(url);
+  }
+  // 核酸检测详情获取
+  public getNucleicDetail(id: any) {
+    const url = `infection/nucleic/detection/detail?id=${id}`;
+    return this.rSerivce.serverObj.get(url);
+  }
 }
diff --git a/src/components/feature/DiseaseInfoNucleic/DiseaseInfoNucleic.vue b/src/components/feature/DiseaseInfoNucleic/DiseaseInfoNucleic.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6e49c9717ee1c80c8e574874e6d5d2f9f7aef5b5
--- /dev/null
+++ b/src/components/feature/DiseaseInfoNucleic/DiseaseInfoNucleic.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="diseaseList">
+    <router-view></router-view>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import { diseaseInfoServer } from '@/api/installServer';
+
+@Component({
+  name: 'DiseaseInfoNucleic',
+})
+export default class DiseaseInfoNucleic extends Vue {}
+</script>
+<style scoped lang="less">
+.diseaseList {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue b/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ceed729f6623f83809b2c115e0de988e5f738efc
--- /dev/null
+++ b/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue
@@ -0,0 +1,644 @@
+<template>
+  <div class="diseaseList nucleic">
+    <div class="diseaseList-tool-bar">
+      <span class="tool-bar-title">核酸检测疫情人员列表</span>
+      <div class="tool-bar-opera">
+        <el-button type="primary" @click="reset" size="small">重置</el-button>
+        <!-- <el-button
+          type="primary"
+          @click="dataCompare"
+          size="small"
+          v-if="sourceType === '1' || sourceType === '0'"
+          >数据对比</el-button
+        > -->
+        <!-- <el-button
+          type="primary"
+          @click="downloadYQ"
+          size="small"
+          v-if="sourceType === '1' || sourceType === '0'"
+          >疫情网数据导出</el-button
+        > -->
+        <!-- <el-button
+          type="primary"
+          @click="uploadGL"
+          size="small"
+          v-if="sourceType === '2' || sourceType === '0'"
+          >隔离点数据导入</el-button
+        > -->
+        <!-- <el-button
+          type="primary"
+          @click="downloadGL"
+          size="small"
+          v-if="sourceType === '2' || sourceType === '0'"
+          >隔离点数据导出</el-button
+        > -->
+        <!-- <el-button type="primary" icon="el-icon-plus" size="small" @click="add"
+          >新增/转入</el-button
+        > -->
+      </div>
+    </div>
+    <div class="diseaseList-query-form">
+      <el-form
+        :inline="true"
+        :model="queryInfo"
+        demo-form-inline
+        label-width="100px"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="姓名:">
+              <el-input
+                v-model="queryInfo.suffererName"
+                placeholder="请输入"
+                @input="query('input')"
+                style="width:100%"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="身份证号:">
+              <el-input
+                v-model="queryInfo.idNo"
+                placeholder="请输入"
+                @input="query('input')"
+                style="width:100%"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="送样日期:">
+              <el-date-picker
+                v-model="queryInfo.sendSampleTime"
+                type="date"
+                placeholder="选择日期"
+                format="yyyy 年 MM 月 dd 日"
+                :picker-options="pickerOptions"
+                style="width:100%"
+                @change="query"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检测结果:">
+              <el-select
+                v-model="queryInfo.detectionResult"
+                placeholder="请选择"
+                style="width:100%"
+                @change="query"
+              >
+                <el-option
+                  v-for="(item, index) in resultTypeList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.code"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单位类型:">
+              <el-select
+                v-model="queryInfo.isolationType"
+                placeholder="请选择"
+                @change="query"
+                style="width:100%"
+              >
+                <el-option
+                  v-for="(item, index) in isolationTypeist"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.code"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测次数:">
+              <el-input
+                v-model="queryInfo.detectionNum"
+                placeholder="请输入"
+                type="number"
+                style="width:100%"
+                @input="detectionInput('input')"
+                min="1"
+                max="9999999999"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-form-item label="当前状态:">
+          <el-select
+            v-model="queryInfo.curStatus"
+            placeholder="请选择"
+            @change="query"
+          >
+            <el-option
+              v-for="(item, index) in curStatusList"
+              :key="index"
+              :label="item.name"
+              :value="item.code"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+      </el-form>
+    </div>
+    <div class="diseaseList-data">
+      <el-scrollbar>
+        <el-table :data="tableData">
+          <el-table-column
+            prop="entrustOrg"
+            label="委托单位"
+            min-width="140px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column
+            prop="suffererName"
+            label="姓名"
+            width="90px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+
+          <el-table-column
+            prop="idNo"
+            label="身份证号"
+            min-width="140px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column
+            prop="age"
+            label="年龄"
+            width="70px"
+          ></el-table-column>
+          <el-table-column
+            prop="gender"
+            label="性别"
+            width="70px"
+          ></el-table-column>
+          <el-table-column
+            prop="sendSampleTime"
+            label="送样日期"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <!-- <el-table-column
+            prop="caseType"
+            label="病例分类"
+            :show-overflow-tooltip="true"
+          ></el-table-column> -->
+          <el-table-column
+            prop="detectionNum"
+            label="第几次检测"
+            :show-overflow-tooltip="true"
+            width="100px"
+          ></el-table-column>
+          <el-table-column
+            prop="detectionResult"
+            label="检测结果"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+
+          <el-table-column
+            prop="detectionOrg"
+            label="检测机构"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column label="操作" width="90">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                @click="edit(scope.$index, scope.row)"
+                >详情</el-button
+              >
+              <!-- <el-button
+                size="mini"
+                type="primary"
+                @click="getDetail(scope.$index, scope.row)"
+                >患者画像</el-button
+              > -->
+              <!-- <el-button size="mini" type="danger" @click="remove(scope.row.id)"
+                >删除</el-button
+              > -->
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-scrollbar>
+    </div>
+    <div class="diseaseList-pagination">
+      <el-pagination
+        background
+        :current-page="queryInfo.page"
+        :page-size="queryInfo.size"
+        layout="total, prev, pager, next, jumper"
+        :total="total"
+        @current-change="currentPageChange"
+      ></el-pagination>
+    </div>
+    <el-dialog
+      title="文件上传"
+      :visible.sync="uploadFormVisible"
+      width="600px"
+      top="30vh"
+      @close="uploadClose"
+    >
+      <el-upload
+        class="upload-demo"
+        ref="upload"
+        :action="actionUrl"
+        :limit="1"
+        :on-exceed="handleExceed"
+        :auto-upload="false"
+        accept=".xls,.xlsx"
+        :on-success="uploadSuccess"
+        :on-error="uploadError"
+      >
+        <el-button slot="trigger" size="small" type="primary"
+          >选取文件</el-button
+        >
+        <el-button
+          style="margin-left: 10px;"
+          size="small"
+          type="success"
+          @click="submitUpload"
+          >上传</el-button
+        >
+        <!-- <div slot="tip" class="el-upload__tip">
+          只能上传excel文件
+        </div> -->
+      </el-upload>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button @click="uploadFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="uploadFormVisible = false"
+          >确 定</el-button
+        >
+      </div> -->
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts">
+const serverPath = require('../../../config/index.js').servePath;
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import { diseaseInfoServer } from '@/api/installServer';
+@Component({
+  name: 'DiseaseList',
+})
+export default class DiseasDeList extends Vue {
+  // 角色权限
+  private sourceType: any = '2';
+  // 上传框显示控制
+  private uploadFormVisible: any = false;
+  // 上传框参数
+  private fileList: any = [];
+
+  private actionUrl: any = `${serverPath}/infectionweb/sufferer/import/v1`;
+
+  // 消息提示对象
+  private messageServe: any = this.$message;
+
+  // 搜索关键字
+  private searchInput: string = '';
+
+  // 列表数据
+  private tableData: any[] = [];
+
+  // 查询条件
+  private queryInfo: any = {
+    detectionNum: '',
+    detectionResult: '0',
+    idNo: '',
+    isolationType: '0',
+    page: 1,
+    sendSampleTime: '',
+    size: 10,
+    suffererName: '',
+  };
+
+  // 总条数
+  private total: number = 0;
+
+  // 查询时间
+  private queryDate: any[] = [];
+
+  // 单位类型下拉框数据
+  private isolationTypeist: any[] = [];
+
+  // 检测结果下拉框
+  private resultTypeList: any[] = [];
+
+  // 查询节流阀
+  private queryTimer: any = null;
+
+  // 时间组件配置
+  // 禁用明天开始的日期
+  private pickerOptions: object = (() => {
+    return {
+      disabledDate: (time: any) => {
+        return this.$moment(time).isAfter(this.$moment(), 'day');
+      },
+    };
+  })();
+
+  private created() {
+    this.sourceType = localStorage.getItem('sourcetype');
+    this.getList();
+    this.getIsolationTypeList();
+    this.getDetectionResultTypeList();
+  }
+
+  // 获取发热门诊疫情人员列表
+  private async getList() {
+    const res = await diseaseInfoServer.getNucleicList(this.queryInfo);
+    this.total = res.data.data.totalElements;
+    this.tableData = res.data.data.content;
+  }
+
+  // 单位类型下拉列表
+  private async getIsolationTypeList() {
+    const res = await diseaseInfoServer.getIsolationTypeist();
+    if (res.status !== 200) {
+      return;
+    }
+    this.isolationTypeist = res.data.data;
+  }
+
+  // 检测结果下拉框
+  private async getDetectionResultTypeList() {
+    const res = await diseaseInfoServer.getResultTypeList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.resultTypeList = res.data.data;
+  }
+
+  // 添加
+  private add() {
+    this.$router.push('PeopleInfoAdd');
+  }
+
+  // 编辑
+  private edit(index: number, row: any) {
+    this.$router.push(`PeopleInfoEdit/${row.id}`);
+  }
+
+  // 追溯
+  private getDetail(index: number, row: any) {
+    if (row.idNo && /[0-9]+/.test(row.idNo)) {
+      this.$router.push(`/PatientPortrayal?id=${row.idNo}`);
+    } else {
+      this.$message.error('该患者暂时无法进行追溯');
+    }
+  }
+
+  // 删除
+  private async remove(id: string) {
+    this.messageServe.closeAll();
+    const result = await this.$confirm(
+      '此操作将永久删除该信息, 是否继续?',
+      '提示',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    );
+    if (result !== 'confirm') {
+      return this.$message.info('已取消删除');
+    }
+    const res = await diseaseInfoServer.deleteInfo(id);
+    if (res.data.code !== '200') {
+      return this.$message.error('删除失败');
+    }
+    if (this.queryInfo.page > 1 && this.tableData.length === 1) {
+      this.queryInfo.page--;
+    }
+    this.getList();
+    this.$message.success('删除成功');
+  }
+
+  // 搜索
+  private query(from?: string) {
+    if (!from) {
+      this.queryInfo.page = 1;
+      this.getList();
+      return;
+    }
+    clearTimeout(this.queryTimer);
+    this.queryTimer = setTimeout(() => {
+      this.queryInfo.page = 1;
+      this.getList();
+    }, 300);
+  }
+
+  private detectionInput(from?: string) {
+    this.queryInfo.detectionNum = Number(this.queryInfo.detectionNum).toFixed(
+      0,
+    );
+    if (Number(this.queryInfo.detectionNum) < 1) {
+      this.queryInfo.detectionNum = '';
+    }
+    if (Number(this.queryInfo.detectionNum) > 9999999999) {
+      this.queryInfo.detectionNum = this.queryInfo.detectionNum.slice(0, 10);
+    }
+
+    this.query(from);
+  }
+
+  // 重置
+  private reset() {
+    this.queryInfo.suffererName = '';
+    this.queryInfo.detectionNum = '';
+    this.queryInfo.detectionResult = '0';
+    this.queryInfo.isolationType = '0';
+    this.queryInfo.idNo = '';
+    this.queryInfo.sendSampleTime = '';
+    this.queryDate = [];
+    this.queryInfo.page = 1;
+    this.getList();
+  }
+
+  // 页数切换
+  private currentPageChange(val: number) {
+    this.queryInfo.page = val;
+    this.getList();
+  }
+  private handleExceed(files: any, fileList: any) {
+    this.$message.warning('单次仅支持一个文件上传');
+  }
+  private submitUpload() {
+    const upload: any = this.$refs.upload;
+    upload.submit();
+  }
+  private uploadSuccess() {
+    this.uploadFormVisible = false;
+    this.getList();
+  }
+  private uploadError(error: any) {
+    try {
+      this.$message.error(JSON.parse(error.message).message);
+    } catch (error) {
+      throw error;
+    }
+  }
+  // 疫情网下载
+  private downloadYQ() {
+    const params = {
+      illnessState: '',
+      page: 1,
+      size: 10,
+      idNo: '',
+      suffererName: '',
+      suffererStatus: '',
+      telphone: '',
+      suffererType: '',
+    };
+    diseaseInfoServer.downloadList(params).then((res: any) => {
+      this.downloadFun(res);
+    });
+  }
+
+  // 疫情网上传
+  private uploadYQ() {
+    this.uploadFormVisible = true;
+    this.actionUrl = `${serverPath}/infection/cdc/import`;
+  }
+
+  // 隔离点下载
+  private downloadGL() {
+    const params = {
+      illnessState: '',
+      page: 1,
+      size: 10,
+      idNo: '',
+      suffererName: '',
+      suffererStatus: '',
+      telphone: '',
+      suffererType: '',
+    };
+    diseaseInfoServer.downloadList(params).then((res: any) => {
+      this.downloadFun(res);
+    });
+  }
+
+  // 隔离点上传
+  private uploadGL() {
+    this.uploadFormVisible = true;
+    this.actionUrl = `${serverPath}/infectionweb/sufferer/import/v1`;
+  }
+
+  // 弹窗关闭回调
+  private uploadClose() {
+    const upload: any = this.$refs.upload;
+    upload.uploadFiles = [];
+  }
+
+  // 数据对比
+  private dataCompare() {
+    diseaseInfoServer.dataCompareCDC().then((res: any) => {
+      try {
+        if (res.data.code === '200') {
+          this.$message.success(res.data.msg);
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      } catch (error) {
+        this.$message('系统异常');
+      }
+    });
+  }
+
+  private downloadFun(res: any) {
+    const obj = res.data;
+    const filename = res.headers.filename;
+    if (window.navigator.msSaveOrOpenBlob) {
+      window.navigator.msSaveOrOpenBlob(obj, filename);
+    } else {
+      const tmpDom = document.createElement('a');
+      tmpDom.download = filename || '下载';
+      tmpDom.href = URL.createObjectURL(obj);
+      tmpDom.click(); //  延时释放
+      setTimeout(() => {
+        URL.revokeObjectURL(obj);
+      }, 100);
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.el-scrollbar__view {
+  padding: 0 20px;
+  .el-table__header-wrapper {
+    position: fixed;
+    top: 147px;
+    left: 20px;
+  }
+  .el-table__body-wrapper {
+    background: red;
+    height: auto !important;
+  }
+}
+.diseaseList-tool-bar {
+  margin-top: 0;
+  padding: 6px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 2px solid #dcdfe6;
+  .tool-bar-title {
+    font-size: 18px;
+    color: #1989fa;
+  }
+  .tool-bar-opera {
+    display: flex;
+    .el-button {
+      margin-left: 12px;
+    }
+  }
+}
+.diseaseList-data {
+  height: calc(100% - 238px);
+  .el-table {
+    position: relative;
+    height: auto !important;
+  }
+}
+
+.diseaseList-pagination {
+  border-top: 1px solid #dcdfe6;
+  padding: 5px 16px;
+  .el-pagination {
+    text-align: right;
+  }
+}
+.diseaseList {
+  .diseaseList-query-form {
+    padding: 10px 0 0 0;
+    border-bottom: 1px solid #dcdfe6;
+  }
+}
+
+.diseaseList-nc {
+  height: 100%;
+  overflow: hidden;
+
+  .diseaseList-query-form .el-form {
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+    border-bottom: 1px solid #dcdfe6;
+    .el-form-item {
+      margin: 10px 0;
+      width: 26%;
+      display: flex;
+    }
+  }
+}
+</style>
+<style lang="less">
+.diseaseList.nucleic .el-form--inline .el-form-item__content {
+  width: 180px;
+}
+</style>
diff --git a/src/components/feature/DiseaseInfoNucleic/PeopleInfoAdd.vue b/src/components/feature/DiseaseInfoNucleic/PeopleInfoAdd.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2358b37c22f888abae344ce3abf0bac007fa2797
--- /dev/null
+++ b/src/components/feature/DiseaseInfoNucleic/PeopleInfoAdd.vue
@@ -0,0 +1,659 @@
+<template>
+  <div class="DiseaseAdd">
+    <div class="DiseaseAdd-tool-bar">
+      <span class="tool-bar-title">新增/转入</span>
+      <div>
+        <el-button
+          v-if="type === 'turnIn'"
+          type="primary"
+          size="small"
+          @click="turnIn"
+          >转入</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-check"
+          size="small"
+          @click="save"
+          v-if="type === 'new'"
+          >保存</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-back"
+          size="small"
+          @click="$router.go(-1)"
+          >返回</el-button
+        >
+      </div>
+    </div>
+    <div class="DiseaseAdd-content">
+      <div class="DiseaseAdd-form">
+        <div class="form-title">疫情人员信息</div>
+        <div class="form-wrap">
+          <el-form
+            :rules="rules"
+            ref="ruleForm1"
+            label-width="100px"
+            class="demo-ruleForm"
+            label-position="right"
+            :model="addInfo"
+          >
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="姓名:" prop="suffererName">
+                  <el-input
+                    v-model="addInfo.suffererName"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身份证:" prop="suffererCard">
+                  <el-input
+                    v-model="addInfo.suffererCard"
+                    placeholder="请输入"
+                    @input="cardChange"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="2" v-if="type === 'turnIn'">
+                <el-button type="primary" @click="turnIn">转入</el-button>
+              </el-col> -->
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="联系电话:" prop="suffererTel">
+                  <el-input
+                    v-model="addInfo.suffererTel"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="病情:" prop="illnessState">
+                  <el-select
+                    v-model="addInfo.illnessState"
+                    placeholder="请选择"
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="(item, index) in illnessStateList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.code"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="患者类型:" prop="suffererType">
+                  <el-select
+                    v-model="addInfo.suffererType"
+                    placeholder="请选择"
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="(item, index) in suffererTypeList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.code"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="类型更改时间:">
+                  <el-date-picker
+                    v-model="addInfo.suffererTypeTime"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions"
+                    :disabled="type !== 'turnIn'"
+                    style="width: 100%"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="状态:" prop="suffererStatus">
+                  <el-select
+                    v-model="addInfo.suffererStatus"
+                    placeholder="请选择"
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="(item, index) in suffererStatusList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.code"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="状态更改时间:">
+                  <el-date-picker
+                    v-model="addInfo.suffererStatusTime"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions"
+                    :disabled="type !== 'turnIn'"
+                    style="width: 100%"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="住址:" prop="suffererAddress">
+                  <el-input
+                    v-model="addInfo.suffererAddress"
+                    type="textarea"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="备注:">
+                  <el-input
+                    v-model="addInfo.remark"
+                    type="textarea"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <div class="DiseaseAdd-form">
+        <div class="form-title">隔离医院信息</div>
+        <div class="form-wrap">
+          <el-form
+            :rules="rules"
+            ref="ruleForm2"
+            label-width="100px"
+            class="demo-ruleForm"
+            label-position="right"
+            :model="addInfo"
+          >
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="隔离点/医院:" prop="curSiteId">
+                  <el-select
+                    v-model="addInfo.curSiteId"
+                    placeholder="请选择"
+                    style="width: 100%"
+                    @change="selectSite"
+                  >
+                    <el-option
+                      v-for="(item, index) in siteList"
+                      :key="index"
+                      :label="item.siteName"
+                      :value="item.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="病区/房号:">
+                  <el-input
+                    v-model="addInfo.roomNumber"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="入住时间:">
+                  <el-date-picker
+                    v-model="addInfo.moveIntoTime"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions"
+                    style="width: 100%"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="预计解除时间:">
+                  <el-date-picker
+                    v-model="addInfo.turnOutPlanTime"
+                    type="datetime"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="转入区:" prop="fromAreaCode">
+                  <el-select
+                    v-model="addInfo.fromAreaCode"
+                    placeholder="请选择"
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="(item, index) in districtList"
+                      :key="index"
+                      :label="item.districtName"
+                      :value="item.districtCode"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="转入区医院:">
+                  <el-input
+                    v-model="addInfo.fromAdress"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import { diseaseInfoServer } from '@/api/installServer';
+@Component({
+  name: 'PeopleInfoAdd',
+})
+export default class PeopleInfoAdd extends Vue {
+  private defaultAddInfo: any = {
+    areaCode: '',
+    areaName: '',
+    curSiteId: '',
+    curSiteName: '',
+    fromAddress: '',
+    illnessState: '',
+    moveIntoTime: '',
+    remark: '',
+    roomNumber: '',
+    suffererAddress: '',
+    suffererAge: '',
+    suffererCard: '',
+    suffererGender: '',
+    suffererName: '',
+    suffererStatus: '',
+    suffererStatusTime: '',
+    suffererTel: '',
+    suffererType: '',
+    suffererTypeTime: '',
+    turnOutPlanTime: '',
+    fromAreaCode: '420115',
+  };
+  private addInfo: any = JSON.parse(JSON.stringify(this.defaultAddInfo));
+  private type = 'new';
+
+  // 病患类型下拉框数据
+  private suffererTypeList: any[] = [];
+
+  // 病患状态下拉框数据
+  private suffererStatusList: any[] = [];
+
+  // 隔离点下拉框
+  private siteList: any[] = [];
+
+  // 转出目的下拉框
+  private destinationTypeList: any[] = [];
+
+  // 病情状态下拉框数据
+  private illnessStateList: any[] = [];
+
+  // 区下拉框
+  private districtList: any[] = [];
+
+  private originData: any = null;
+
+  // 性别下拉框
+  private genderList: any[] = [
+    { value: 1, label: '男' },
+    { value: 2, label: '女' },
+  ];
+
+  // 验证表单对象
+  private ruleFormObjUp: any = null;
+  private ruleFormObjDowm: any = null;
+
+  // 添加校验规则
+  private rules = {
+    curSiteId: [
+      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    ],
+    suffererName: [
+      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    ],
+    suffererCard: [
+      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+      { validator: this.validIDCardBlur, trigger: 'blur' },
+      { validator: this.validIDCardChange, trigger: 'change' },
+    ],
+    suffererTel: [
+      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+      { validator: this.validTelBlur, trigger: 'blur' },
+      { validator: this.validTelChange, trigger: 'change' },
+    ],
+    suffererStatus: [
+      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    ],
+    suffererType: [
+      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    ],
+    illnessState: [
+      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    ],
+    // suffererAddress: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    // ],
+  };
+
+  // 时间组件配置
+  private pickerOptions: object = (() => {
+    return {
+      disabledDate: (time: any) => {
+        return this.$moment(time).isAfter(this.$moment(), 'day');
+      },
+    };
+  })();
+
+  private selectSite(val: string) {
+    this.siteList.some((item: any) => {
+      if (item.id === val) {
+        this.addInfo.curSiteName = item.siteName;
+        return true;
+      }
+    });
+  }
+
+  // 转入切换
+  private cardChange() {
+    if (this.addInfo.suffererCard) {
+      diseaseInfoServer
+        .getSuffererInfoByIDCard(this.addInfo.suffererCard)
+        .then((res: any) => {
+          if (res.data.code === '201' && res.data.data) {
+            this.type = 'turnIn';
+            const id = res.data.data;
+            diseaseInfoServer.searchSuffererInfo(id).then((response: any) => {
+              if (response.status === 200) {
+                this.addInfo = response.data.data;
+                this.addInfo.suffererType = `${this.addInfo.suffererType}`;
+                // 下拉列表移除上一次的隔离点
+                const prevSiteId = this.addInfo.curSiteId;
+                this.removePrevSite(prevSiteId);
+
+                this.addInfo.curSiteId = '';
+                this.originData = {
+                  suffererStatus: this.addInfo.suffererStatus,
+                  suffererType: this.addInfo.suffererType,
+                  curSiteId: this.addInfo.curSiteId,
+                  suffererStatusTime: this.addInfo.suffererStatusTime,
+                  suffererTypeTime: this.addInfo.suffererTypeTime,
+                  moveIntoTime: this.addInfo.moveIntoTime,
+                };
+              }
+            });
+          } else {
+            this.type = 'new';
+          }
+        });
+    } else {
+      this.type = 'new';
+    }
+  }
+
+  // 移除上一次的隔离点
+  private removePrevSite(prevSiteId: any) {
+    this.siteList = this.siteList.filter((item: any) => item.id !== prevSiteId);
+  }
+
+  // 身份证验证
+  private validIDCardChange(rule: any, value: string, callback: any) {
+    if (
+      value.length >= 18 &&
+      !/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
+        value,
+      )
+    ) {
+      return callback(new Error('请输入有效的身份证号码'));
+    }
+    callback();
+  }
+  private validIDCardBlur(rule: any, value: string, callback: any) {
+    if (
+      !/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
+        value,
+      )
+    ) {
+      return callback(new Error('请输入有效的身份证号码'));
+    }
+    callback();
+  }
+
+  // 手机号校验
+  private validTelChange(rule: any, value: string, callback: any) {
+    if (value.length >= 11 && !/^1(3|4|5|6|7|8|9)\d{9}$/.test(value)) {
+      return callback(new Error('请输入有效的手机号码'));
+    }
+    callback();
+  }
+  private validTelBlur(rule: any, value: string, callback: any) {
+    if (!/^1(3|4|5|6|7|8|9)\d{9}$/.test(value)) {
+      return callback(new Error('请输入有效的手机号码'));
+    }
+    callback();
+  }
+
+  private created() {
+    this.getPatientTypeList();
+    this.getSuffererStatus();
+    this.getIllnessStateList();
+    this.getSiteList();
+    this.getFindDestinationTypeList();
+    this.getAreaList();
+  }
+
+  private mounted() {
+    this.ruleFormObjUp = this.$refs.ruleForm1;
+    this.ruleFormObjDowm = this.$refs.ruleForm2;
+  }
+
+  // 区下拉框
+  private async getAreaList() {
+    const res = await diseaseInfoServer.getAreaOptions();
+    if (res.status !== 200) {
+      return;
+    }
+    this.districtList = res.data.data;
+  }
+  // 状态下拉列表
+  private async getSuffererStatus() {
+    const res = await diseaseInfoServer.getSuffererStatus();
+    if (res.status !== 200) {
+      return;
+    }
+    this.suffererStatusList = res.data.data;
+  }
+
+  // 病患类型下拉框
+  private async getPatientTypeList() {
+    const res = await diseaseInfoServer.getPatientTypeList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.suffererTypeList = res.data.data;
+  }
+
+  // 病情状态下拉框
+  private async getIllnessStateList() {
+    const res = await diseaseInfoServer.getIllnessStateList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.illnessStateList = res.data.data;
+  }
+
+  // 隔离点下拉框
+  private async getSiteList() {
+    const res = await diseaseInfoServer.getTurnOutPlace();
+    if (res.status !== 200) {
+      return;
+    }
+    this.siteList = res.data.data;
+  }
+
+  // 转出目的类型下拉框
+  private async getFindDestinationTypeList() {
+    const res = await diseaseInfoServer.getFindDestinationTypeList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.destinationTypeList = res.data.data;
+  }
+
+  // 地区
+  private areaChange(val: string) {
+    this.districtList.some((item: any) => {
+      if (item.areaCode === val) {
+        this.addInfo.areaName = item.areaName;
+        return true;
+      }
+    });
+  }
+
+  // 保存
+  private save() {
+    this.ruleFormObjUp.validate((validUp: any) => {
+      this.ruleFormObjDowm.validate(async (validDown: any) => {
+        if (!validUp || !validDown) {
+          return;
+        }
+        if (
+          this.type === 'new' &&
+          this.addInfo.curSiteId &&
+          !this.addInfo.moveIntoTime
+        ) {
+          this.$message.error('隔离点/医院修改需更新入住时间');
+          return;
+        }
+        const params = JSON.parse(JSON.stringify(this.addInfo));
+        params.moveIntoTime = this.tiemtZone(params.moveIntoTime);
+        params.suffererStatusTime = this.tiemtZone(params.suffererStatusTime);
+        params.suffererTypeTime = this.tiemtZone(params.suffererTypeTime);
+        params.turnOutPlanTime = this.tiemtZone(params.turnOutPlanTime);
+        const res: any = await diseaseInfoServer.saveSuffererInfo(params);
+        if (res.status !== 200 || res.data.code !== '200') {
+          return this.$message.error('保存失败');
+        }
+        this.$message.success('保存成功');
+        this.$router.go(-1);
+      });
+    });
+  }
+
+  // 转入
+  private turnIn() {
+    this.ruleFormObjUp.validate((validUp: any) => {
+      this.ruleFormObjDowm.validate(async (validDown: any) => {
+        if (!validUp || !validDown) {
+          return;
+        }
+        if (
+          this.type === 'turnIn' &&
+          this.originData.suffererStatus !== this.addInfo.suffererStatus &&
+          this.addInfo.suffererStatusTime === this.originData.suffererStatusTime
+        ) {
+          this.$message.error('状态修改需更新状态更改时间');
+          return;
+        }
+        if (
+          this.type === 'turnIn' &&
+          this.originData.suffererType !== this.addInfo.suffererType &&
+          this.addInfo.suffererTypeTime === this.originData.suffererTypeTime
+        ) {
+          this.$message.error('患者类型修改需更新类型更改时间');
+          return;
+        }
+        if (
+          this.type === 'turnIn' &&
+          this.originData.curSiteId !== this.addInfo.curSiteId &&
+          this.addInfo.moveIntoTime === this.originData.moveIntoTime
+        ) {
+          this.$message.error('隔离点/医院修改需更新入住时间');
+          return;
+        }
+        const params = JSON.parse(JSON.stringify(this.addInfo));
+        params.moveIntoTime = this.tiemtZone(params.moveIntoTime);
+        params.suffererStatusTime = this.tiemtZone(params.suffererStatusTime);
+        params.suffererTypeTime = this.tiemtZone(params.suffererTypeTime);
+        params.turnOutPlanTime = this.tiemtZone(params.turnOutPlanTime);
+        const res: any = await diseaseInfoServer.updateSuffererInfo(params);
+        if (res.status !== 200 || res.data.code !== '200') {
+          return this.$message.error('转入失败');
+        }
+        this.$message.success('转入成功');
+        this.$router.go(-1);
+      });
+    });
+  }
+  // 时间过滤
+  private tiemtZone(time: any) {
+    const value = this.$moment(time).format('YYYY-MM-DD HH:mm');
+    if (value === 'Invalid date') {
+      return '';
+    }
+    return value;
+  }
+}
+</script>
+<style scoped lang="less">
+.DiseaseAdd {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .DiseaseAdd-tool-bar {
+    margin-top: 0;
+    padding: 6px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 2px solid #dcdfe6;
+    .tool-bar-title {
+      font-size: 18px;
+      color: #1989fa;
+    }
+  }
+
+  .DiseaseAdd-content {
+    flex: 1;
+    overflow-y: auto;
+    .DiseaseAdd-form {
+      .form-title {
+        padding-left: 30px;
+        height: 50px;
+        line-height: 50px;
+        text-align: left;
+        font-weight: bold;
+      }
+    }
+    .form-wrap {
+      width: 80%;
+      margin: 0 auto;
+    }
+  }
+}
+</style>
diff --git a/src/components/feature/DiseaseInfoNucleic/PeopleInfoDetail.vue b/src/components/feature/DiseaseInfoNucleic/PeopleInfoDetail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a2a3b7c8f0b37648cbacc0b152d7a8abb8b2f864
--- /dev/null
+++ b/src/components/feature/DiseaseInfoNucleic/PeopleInfoDetail.vue
@@ -0,0 +1,101 @@
+<template>
+  <div class="diseaseList">
+    <div class="diseaseList-tool-bar">
+      <span class="tool-bar-title"
+        >病患人员: <span>{{ sufferName }}</span></span
+      >
+      <div>
+        <el-button
+          type="primary"
+          icon="el-icon-back"
+          size="small"
+          @click="$router.go(-1)"
+          >返回</el-button
+        >
+      </div>
+    </div>
+    <div class="diseaseList-data">
+      <el-table :data="tableData">
+        <el-table-column
+          prop="hospitalName"
+          label="医疗/隔离点名称"
+        ></el-table-column>
+        <el-table-column prop="changeType" label="状态/病例"></el-table-column>
+        <el-table-column prop="changeInfo" label="数据"></el-table-column>
+        <el-table-column prop="changeTime" label="日期"></el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import { diseaseInfoServer } from '@/api/installServer';
+
+@Component({
+  name: 'DiseaseInfoDetail',
+})
+export default class DiseaseInfoDetail extends Vue {
+  // 病患id
+  private id: string = '';
+  private sufferName: string = '';
+
+  // 列表数据
+  private tableData: any[] = [];
+
+  private created() {
+    this.id = this.$route.params.id;
+    this.getList();
+  }
+
+  // 获取列表
+  private async getList() {
+    const res = await diseaseInfoServer.getCDCSuffererHistory(this.id);
+    if (res.status !== 200) {
+      return this.$message.error('获取数据失败');
+    }
+    this.sufferName = res.data.data.suffererName;
+    // this.total = res.data.data.totalElements;
+    this.tableData = res.data.data.list;
+    this.tableData.forEach((item: any) => {
+      if (item.time) {
+        item.encodeTime = this.$moment(item.time).format('YYYY-MM-DD HH:mm');
+      }
+    });
+    // console.log(this.tableData);
+  }
+}
+</script>
+<style scoped lang="less">
+.diseaseList {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .diseaseList-tool-bar {
+    margin-top: 0;
+    padding: 6px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 2px solid #dcdfe6;
+    .tool-bar-title {
+      font-size: 18px;
+      color: #1989fa;
+      font-weight: normal;
+    }
+    .tool-bar-opera {
+      display: flex;
+      .el-button {
+        margin-left: 12px;
+      }
+    }
+  }
+  .diseaseList-data {
+    overflow: auto;
+    -ms-overflow-style: none;
+  }
+  .diseaseList-data::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>
diff --git a/src/components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue b/src/components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..47e2030a59dd729c128bfab69ce602bf828fc121
--- /dev/null
+++ b/src/components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue
@@ -0,0 +1,557 @@
+<template>
+  <div class="DiseaseAdd">
+    <div class="DiseaseAdd-tool-bar">
+      <span class="tool-bar-title">详情</span>
+      <div>
+        <!-- <el-button
+          type="primary"
+          icon="el-icon-check"
+          size="small"
+          @click="save"
+          >保存</el-button
+        > -->
+        <el-button
+          type="primary"
+          icon="el-icon-back"
+          size="small"
+          @click="$router.go(-1)"
+          >返回</el-button
+        >
+      </div>
+    </div>
+    <div class="DiseaseAdd-content">
+      <div class="DiseaseAdd-form">
+        <div class="form-title">疫情人员信息</div>
+        <div class="form-wrap">
+          <el-form
+            :rules="rules"
+            ref="ruleFormUp"
+            label-width="140px"
+            class="demo-ruleForm"
+            label-position="right"
+            :model="editInfo"
+          >
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="姓名:" prop="suffererName">
+                  <el-input
+                    v-model="editInfo.suffererName"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身份证号:" prop="idNo">
+                  <el-input
+                    v-model="editInfo.idNo"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="性别:" prop="gender">
+                  <el-input
+                    v-model="editInfo.gender"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="年龄:" prop="age">
+                  <el-input
+                    v-model="editInfo.age"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="隔离点:" prop="isolationPoint">
+                  <el-input
+                    v-model="editInfo.isolationPoint"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="单位类型:" prop="isolationType">
+                  <el-input
+                    v-model="editInfo.isolationType"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="委托单位:" prop="entrustOrg">
+                  <el-input
+                    v-model="editInfo.entrustOrg"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="送样日期:" prop="sendSampleTime">
+                  <el-input
+                    v-model="editInfo.sendSampleTime"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="第几次检测:" prop="detectionNum">
+                  <el-input
+                    v-model="editInfo.detectionNum"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="检测结果:" prop="detectionResult">
+                  <el-input
+                    v-model="editInfo.detectionResult"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="检测机构:" prop="detectionOrg">
+                  <el-input
+                    v-model="editInfo.detectionOrg"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <el-form-item label="备注:" prop="note">
+                  <el-input
+                    type="textarea"
+                    v-model="editInfo.note"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import { diseaseInfoServer } from '@/api/installServer';
+
+@Component({
+  name: 'PeopleInfoEdit',
+})
+export default class PeopleInfoEdit extends Vue {
+  private id: any;
+  private editInfo: any = {
+    areaCode: '',
+    areaName: '',
+    curSiteId: '',
+    curSiteName: '',
+    deathDate: '',
+    id: '',
+    illnessState: '',
+    moveIntoTime: '',
+    remark: '',
+    roomNumber: '',
+    seqNumber: '',
+    detailedAddress: '',
+    suffererAge: '',
+    suffererGender: '',
+    sex: '',
+    suffererStatus: '',
+    clinicalSeverity: '',
+    telphone: '',
+    caseType: '',
+    caseDate: '',
+    diseaseName: '',
+    turnOutPlanTime: '',
+    turnOutTime: '',
+    turnOutToPlace: '',
+    turnOutToPlaceType: '',
+    workUnit: '',
+    hospital: '',
+    address: '',
+    syptom: '',
+    gender: '',
+    direction: '',
+    age: '',
+    idNo: '',
+    consultationTime: '',
+    note: '',
+  };
+
+  // 病患类型下拉框数据
+  private suffererTypeList: any[] = [];
+
+  // 病患状态下拉框数据
+  private suffererStatusList: any[] = [];
+
+  // 隔离点下拉框
+  private siteList: any[] = [];
+
+  // 转出目的下拉框
+  private destinationTypeList: any[] = [];
+
+  // 病情状态下拉框数据
+  private illnessStateList: any[] = [];
+
+  // 区下拉框
+  private districtList: any[] = [];
+
+  // 性别下拉框
+  private genderList: any[] = [
+    { value: 1, label: '男' },
+    { value: 2, label: '女' },
+  ];
+
+  // 验证表单对象
+  private ruleFormObjUp: any = null;
+  private ruleFormObjDown: any = null;
+
+  private originData: any = null;
+
+  // 添加校验规则
+  private rules = {
+    // curSiteId: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    // ],
+    // suffererName: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    // ],
+    // suffererCard: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    //   { validator: this.validIDCardBlur, trigger: 'blur' },
+    //   { validator: this.validIDCardChange, trigger: 'change' },
+    // ],
+    // telphone: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    //   { validator: this.validTelBlur, trigger: 'blur' },
+    //   { validator: this.validTelChange, trigger: 'change' },
+    // ],
+    // suffererStatus: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    // ],
+    // suffererType: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    // ],
+    // illnessState: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    // ],
+    // detailedAddress: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    // ],
+  };
+
+  // 时间组件配置
+  private pickerOptions: object = (() => {
+    return {
+      disabledDate: (time: any) => {
+        return this.$moment(time).isAfter(this.$moment(), 'day');
+      },
+    };
+  })();
+
+  // 身份证验证
+  private validIDCardChange(rule: any, value: string, callback: any) {
+    if (
+      value.length >= 18 &&
+      !/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
+        value,
+      )
+    ) {
+      return callback(new Error('请输入有效的身份证号码'));
+    }
+    callback();
+  }
+  private validIDCardBlur(rule: any, value: string, callback: any) {
+    if (
+      !/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
+        value,
+      )
+    ) {
+      return callback(new Error('请输入有效的身份证号码'));
+    }
+    callback();
+  }
+
+  // 手机号校验
+  private validTelChange(rule: any, value: string, callback: any) {
+    if (value.length >= 11 && !/^1(3|4|5|6|7|8|9)\d{9}$/.test(value)) {
+      return callback(new Error('请输入有效的手机号码'));
+    }
+    callback();
+  }
+  private validTelBlur(rule: any, value: string, callback: any) {
+    if (!/^1(3|4|5|6|7|8|9)\d{9}$/.test(value)) {
+      return callback(new Error('请输入有效的手机号码'));
+    }
+    callback();
+  }
+
+  private created() {
+    // this.getSuffererStatus();
+    // this.getPatientTypeList();
+    // this.getIllnessStateList();
+    // this.getSiteList();
+    // this.getFindDestinationTypeList();
+    // this.getAreaList();
+  }
+
+  private mounted() {
+    this.id = this.$route.params.id;
+    this.getNucleicInfo();
+    this.ruleFormObjUp = this.$refs.ruleFormUp;
+    this.ruleFormObjDown = this.$refs.ruleFormDown;
+  }
+
+  private getNucleicInfo() {
+    diseaseInfoServer.getNucleicDetail(this.id).then((res: any) => {
+      if (res.status === 200) {
+        this.editInfo = res.data.data;
+        this.editInfo.suffererType = `${this.editInfo.suffererType}`;
+        this.editInfo.consultationTime = this.editInfo.consultationTime
+          ? this.editInfo.consultationTime
+          : '';
+        this.originData = {
+          suffererStatus: this.editInfo.suffererStatus,
+          suffererType: this.editInfo.suffererType,
+          curSiteId: this.editInfo.curSiteId,
+          suffererStatusTime: this.editInfo.suffererStatusTime,
+          suffererTypeTime: this.editInfo.suffererTypeTime,
+          moveIntoTime: this.editInfo.moveIntoTime,
+        };
+      }
+    });
+  }
+
+  // 区下拉框
+  private async getAreaList() {
+    const res = await diseaseInfoServer.getAreaOptions();
+    if (res.status !== 200) {
+      return;
+    }
+    this.districtList = res.data.data;
+  }
+  // 病患类型下拉框
+  private async getPatientTypeList() {
+    const res = await diseaseInfoServer.getPatientTypeList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.suffererTypeList = res.data.data;
+  }
+
+  // 状态下拉列表
+  private async getSuffererStatus() {
+    const res = await diseaseInfoServer.getSuffererStatus();
+    if (res.status !== 200) {
+      return;
+    }
+    this.suffererStatusList = res.data.data;
+  }
+
+  // 病情状态下拉框
+  private async getIllnessStateList() {
+    const res = await diseaseInfoServer.getIllnessStateList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.illnessStateList = res.data.data;
+    // if (this.editInfo.illnessState === '') {
+    //   this.editInfo.illnessState = this.illnessStateList[this.illnessStateList.length - 1].code;
+    // }
+  }
+
+  // 隔离点下拉框
+  private async getSiteList() {
+    const res = await diseaseInfoServer.getTurnOutPlace();
+    if (res.status !== 200) {
+      return;
+    }
+    this.siteList = res.data.data;
+  }
+
+  // 转出目的类型下拉框
+  private async getFindDestinationTypeList() {
+    const res = await diseaseInfoServer.getFindDestinationTypeList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.destinationTypeList = res.data.data;
+  }
+
+  // 人员状态
+  private suffererStatusChange(val: string) {
+    // if (val === '1' || val === '2') {
+    //   this.editInfo.turnOutTime = '';
+    // }
+    // if (val !== '4') {
+    //   this.editInfo.deathDate = '';
+    // }
+  }
+
+  // 人员类型
+  // private suffererTypeChange(val: string) {
+  //   if (val !== '4') {
+  //     this.editInfo.illnessState = this.illnessStateList[
+  //       this.illnessStateList.length - 1
+  //     ].code;
+  //   }
+  // }
+
+  // 地区
+  private areaChange(val: string) {
+    this.districtList.some((item: any) => {
+      if (item.areaCode === val) {
+        this.editInfo.areaName = item.areaName;
+        return true;
+      }
+    });
+  }
+
+  private selectSite(val: string) {
+    this.siteList.some((item: any) => {
+      if (item.id === val) {
+        this.editInfo.curSiteName = item.siteName;
+        return true;
+      }
+    });
+  }
+
+  // 保存
+  private save() {
+    this.ruleFormObjUp.validate((validUp: any) => {
+      this.ruleFormObjDown.validate(async (validDown: any) => {
+        if (!validUp || !validDown) {
+          return;
+        }
+        if (
+          this.originData.suffererStatus !== this.editInfo.suffererStatus &&
+          this.editInfo.suffererStatusTime ===
+            this.originData.suffererStatusTime
+        ) {
+          this.$message.error('状态修改需更新状态更改时间');
+          return;
+        }
+        if (
+          this.originData.suffererType !== this.editInfo.suffererType &&
+          this.editInfo.suffererTypeTime === this.originData.suffererTypeTime
+        ) {
+          this.$message.error('患者类型修改需更新类型更改时间');
+          return;
+        }
+        if (
+          this.originData.curSiteId !== this.editInfo.curSiteId &&
+          this.editInfo.moveIntoTime === this.originData.moveIntoTime
+        ) {
+          this.$message.error('隔离点/医院修改需更新入住时间');
+          return;
+        }
+        const parasm = JSON.parse(JSON.stringify(this.editInfo));
+        parasm.suffererStatusTime = this.tiemtZone(parasm.suffererStatusTime);
+        parasm.moveIntoTime = this.tiemtZone(parasm.moveIntoTime);
+        parasm.turnOutPlanTime = this.tiemtZone(parasm.turnOutPlanTime);
+        parasm.suffererTypeTime = this.tiemtZone(parasm.suffererTypeTime);
+        const res = await diseaseInfoServer.updateSuffererInfo(parasm);
+        if (res.status !== 200) {
+          return this.$message.error('保存失败');
+        }
+        this.$message.success('保存成功');
+        this.$router.go(-1);
+      });
+    });
+  }
+
+  // 时间过滤
+  private tiemtZone(time: any) {
+    const value = this.$moment(time).format('YYYY-MM-DD HH:mm');
+    if (value === 'Invalid date') {
+      return '';
+    }
+    return value;
+  }
+}
+</script>
+<style scoped lang="less">
+.DiseaseAdd {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .DiseaseAdd-tool-bar {
+    margin-top: 0;
+    padding: 6px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 2px solid #dcdfe6;
+    .tool-bar-title {
+      font-size: 18px;
+      color: #1989fa;
+    }
+  }
+
+  .DiseaseAdd-content {
+    flex: 1;
+    overflow-y: auto;
+    -ms-overflow-style: none;
+    .DiseaseAdd-form {
+      .form-title {
+        padding-left: 30px;
+        height: 50px;
+        line-height: 50px;
+        text-align: left;
+        font-weight: bold;
+      }
+    }
+    .form-wrap {
+      width: 86%;
+      margin: 0 auto;
+      padding-bottom: 40px;
+    }
+  }
+  .DiseaseAdd-content::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+    background-color: #ffffff;
+  }
+  .DiseaseAdd-content::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.3);
+    border-radius: 10px;
+    background-color: #ffffff;
+  }
+  .DiseaseAdd-content::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
+    background-color: #f5f5f5;
+  }
+}
+</style>
diff --git a/src/router/router.ts b/src/router/router.ts
index 6257c372e28676e72b38abdc45da3e72cfae65e3..40e8e13b24d689138586115c82e56e6733997235 100644
--- a/src/router/router.ts
+++ b/src/router/router.ts
@@ -21,6 +21,12 @@ import PeopleInfoAddFR from '../components/feature/DiseaseInfoFeverClinic/People
 import PeopleInfoEditFR from '../components/feature/DiseaseInfoFeverClinic/PeopleInfoEdit.vue'; // 人员编辑
 import PeopleInfoDetailFR from '../components/feature/DiseaseInfoFeverClinic/PeopleInfoDetail.vue'; // 病情追溯
 
+import DiseaseInfoNucleic from '../components/feature/DiseaseInfoNucleic/DiseaseInfoNucleic.vue'; // 核算检测疫情人员列表
+import DiseaseListNucleic from '../components/feature/DiseaseInfoNucleic/DiseaseList.vue'; // 疫情信息列表页面
+import PeopleInfoAddNucleic from '../components/feature/DiseaseInfoNucleic/PeopleInfoAdd.vue'; // 人员新增/转入
+import PeopleInfoEditNucleic from '../components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue'; // 人员编辑
+import PeopleInfoDetailNucleic from '../components/feature/DiseaseInfoNucleic/PeopleInfoDetail.vue'; // 病情追溯
+
 import DiseaseInfoHospitalDD from '../components/feature/DiseaseInfoHospitalDD/DiseaseInfoHospitalDD.vue'; // 定点医院人员列表
 import DiseaseListDD from '../components/feature/DiseaseInfoHospitalDD/DiseaseList.vue'; // 疫情信息列表页面
 import PeopleInfoAddDD from '../components/feature/DiseaseInfoHospitalDD/PeopleInfoAdd.vue'; // 人员新增/转入
@@ -203,6 +209,34 @@ const router = new Router({
             },
           ],
         },
+        {
+          path: 'DiseaseInfoNucleic',
+          redirect: '/LayoutHome/DiseaseInfoNucleic/DiseaseList',
+          name: 'DiseaseInfoNucleic',
+          component: DiseaseInfoNucleic,
+          children: [
+            {
+              path: 'DiseaseList',
+              name: 'DiseaseListNucleic',
+              component: DiseaseListNucleic,
+            },
+            {
+              path: 'PeopleInfoAdd',
+              name: 'PeopleInfoAddNucleic',
+              component: PeopleInfoAddNucleic,
+            },
+            {
+              path: 'PeopleInfoEdit/:id',
+              name: 'PeopleInfoEditNucleic',
+              component: PeopleInfoEditNucleic,
+            },
+            {
+              path: 'PeopleInfoDetail/:id',
+              name: 'PeopleInfoDetailNucleic',
+              component: PeopleInfoDetailNucleic,
+            },
+          ],
+        },
         {
           path: 'AccumulativeStatistics',
           name: 'AccumulativeStatistics',
diff --git a/src/views/LayoutHome.vue b/src/views/LayoutHome.vue
index 11bff424cc17c0f8cf019c97e353c34922d48a47..78d46bf9b743c08212b77b2671964c785969dc09 100644
--- a/src/views/LayoutHome.vue
+++ b/src/views/LayoutHome.vue
@@ -2,7 +2,7 @@
   <div class="layoutHome-wrap">
     <div class="layout-head">
       <div class="logo head-item"></div>
-      <div class="title head-item">病患溯源管理系统</div>
+      <div class="title head-item">疫情通</div>
       <div class="userInfo head-item">欢迎您, {{ userName }}</div>
       <div class="loginOut head-item">
         <el-button type="text" @click="loginOut"
@@ -61,7 +61,7 @@ export default class LayoutHome extends Vue {
     }
     .logo {
       background: url('../../src/assets/img/icon-home.png') no-repeat;
-      background-size: 70%;
+      background-size: 65%;
       background-position: center;
       width: 60px;
       flex-shrink: 0;
@@ -70,7 +70,7 @@ export default class LayoutHome extends Vue {
     .title {
       width: 90%;
       line-height: 60px;
-      font-size: 32px;
+      font-size: 36px;
     }
     .userInfo {
       text-align: center;
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 5954db42f55f60e5e120650ec22484c8d640c85a..bf1beff6043b58bd8898ed8919b186d6272b6062 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login-page" @keyup.enter="submitForm('ruleForm')">
     <div class="main-title">
-      病患溯源管理系统
+      疫情通
     </div>
     <!-- <div class="eng-title">
       NEW CORONAVIRUS SERVICE PLATFRORM
@@ -78,12 +78,7 @@ export default class Login extends Vue {
                   break;
                 case 3:
                   this.$router.push({
-                    path: '/LayoutHome/DiseaseInfoHospitalFC',
-                  });
-                  break;
-                case 4:
-                  this.$router.push({
-                    path: '/LayoutHome/DiseaseInfoHospitalDD',
+                    path: '/LayoutHome/DiseaseInfoNucleic',
                   });
                   break;
               }
diff --git a/src/views/MenuList.vue b/src/views/MenuList.vue
index d58941a1483b1b73a45a97c804e29838b442d84d..bcb1d1b021b35ac2ff4ba010e3ed298a4ec851d9 100644
--- a/src/views/MenuList.vue
+++ b/src/views/MenuList.vue
@@ -4,9 +4,9 @@
       <el-radio-button :label="false">展开</el-radio-button>
       <el-radio-button :label="true">收起</el-radio-button>
     </el-radio-group> -->
-    <div class="menu-btn">
+    <!-- <div class="menu-btn">
       疫情通
-    </div>
+    </div> -->
     <el-menu
       :default-active="currentIndex"
       class="el-menu-vertical-demo"
@@ -37,37 +37,42 @@ export default class MenuList extends Vue {
     {
       name: '疫情网疫情人员列表',
       path: '/LayoutHome/DiseaseInfoYQ',
-      authority: '1',
+      authority: ['0', '1'],
     },
     {
       name: '隔离点疫情人员列表',
       path: '/LayoutHome/DiseaseInfoGL',
-      authority: '2',
+      authority: ['0', '2'],
     },
     {
       name: '方舱医院疫情人员列表',
       path: '/LayoutHome/DiseaseInfoHospitalFC',
-      authority: '3',
+      authority: ['0', '1', '2'],
     },
     {
       name: '定点医院疫情人员列表',
       path: '/LayoutHome/DiseaseInfoHospitalDD',
-      authority: '4',
+      authority: ['0', '1', '2'],
     },
     {
       name: '发热门诊疫情人员列表',
       path: '/LayoutHome/DiseaseInfoFR',
-      authority: '5',
+      authority: ['0', '1', '2'],
+    },
+    {
+      name: '核酸检测疫情人员列表',
+      path: '/LayoutHome/DiseaseInfoNucleic',
+      authority: ['0', , '1', '2', '3'],
     },
     {
       name: '疫情网数据统计',
       path: '/LayoutHome/AccumulativeStatistics',
-      authority: 'all',
+      authority: ['0', '1', '2'],
     },
     {
       name: '隔离点数据统计',
       path: '/LayoutHome/IsolationPointStatistics',
-      authority: 'all',
+      authority: ['0', '1', '2'],
     },
   ];
   private isCollapse: any = false;
@@ -76,13 +81,12 @@ export default class MenuList extends Vue {
     const sourceType = localStorage.getItem('sourcetype');
     const list: any = [];
     this.routeList.forEach((item: any) => {
-      if (item.authority === sourceType || item.authority === 'all') {
+      if (item.authority.includes(sourceType)) {
         list.push(item);
       }
     });
-    if (sourceType !== '0') {
-      this.routeList = list;
-    }
+
+    this.routeList = list;
 
     // if (sourceType === '1') {
     //   this.routeList.splice(1, 1);