From 1e0c239da6b5d2ad38474c53772994834c7a19df Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Tue, 10 Mar 2020 16:40:55 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E7=82=B9?=
 =?UTF-8?q?=E5=8C=BB=E9=99=A2=E7=96=AB=E6=83=85=E4=BA=BA=E5=91=98=E6=B2=BB?=
 =?UTF-8?q?=E6=84=88=E5=87=BA=E9=99=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue b/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
index a906ea7..bace9a6 100644
--- a/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
+++ b/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
@@ -153,6 +153,11 @@
                   <el-input v-model="editInfo.deathDate" placeholder></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="治愈出院时间:">
+                  <el-input v-model="editInfo.dischargeTime" placeholder></el-input>
+                </el-form-item>
+              </el-col>
               <!-- <el-col :span="12">
                 <el-form-item label="预计解除时间:">
                   <el-date-picker
-- 
Gitee


From 4472b421c98e87300c6085903d61095f5b9975d7 Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Tue, 10 Mar 2020 17:05:25 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E7=82=B9?=
 =?UTF-8?q?=E5=8C=BB=E9=99=A2=E7=96=AB=E6=83=85=E4=BA=BA=E5=91=98=E6=B2=BB?=
 =?UTF-8?q?=E6=84=88=E5=87=BA=E9=99=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue b/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
index bace9a6..cf4ffcc 100644
--- a/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
+++ b/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
@@ -149,13 +149,13 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
-                <el-form-item label="死亡时间:">
-                  <el-input v-model="editInfo.deathDate" placeholder></el-input>
+                <el-form-item label="治愈出院时间:">
+                  <el-input v-model="editInfo.dischargeTime" placeholder></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="治愈出院时间:">
-                  <el-input v-model="editInfo.dischargeTime" placeholder></el-input>
+                <el-form-item label="死亡时间:">
+                  <el-input v-model="editInfo.deathDate" placeholder></el-input>
                 </el-form-item>
               </el-col>
               <!-- <el-col :span="12">
-- 
Gitee


From 579e29ab9ee8e0b4fcfeb445d60574ced156287f Mon Sep 17 00:00:00 2001
From: ChiyokoYY <525231835@qq.com>
Date: Tue, 10 Mar 2020 18:16:18 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E6=97=A5=E6=9C=9F=E5=92=8Ctab?=
 =?UTF-8?q?=E8=AE=B0=E5=BF=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccumulativeStatistics.vue                   | 16 +++++++++++++++-
 src/views/MenuList.vue                           |  2 ++
 src/views/PatientPortrayal.vue                   | 13 ++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
index 468eee1..aa8c1d2 100644
--- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
+++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
@@ -2,7 +2,7 @@
   <div class="accumulativeStatistics">
     <div class="diseaseList-tool-bar">
       <span class="tool-bar-title">
-        累计数据统计分析(按居住地统计): 截止{{ expiryDate }}
+        累计数据统计分析(按报告地统计): 截止{{ expiryDate }}
         24时江夏统计数据如下
       </span>
     </div>
@@ -221,6 +221,7 @@ import AccuItem from './AccuItem.vue';
   components: { AccuItem },
 })
 export default class DiseaseInfo extends Vue {
+  private tabType:any;
   private params = {
     nowPage: 1,
     pageSize: 10,
@@ -298,6 +299,7 @@ export default class DiseaseInfo extends Vue {
     this.params.type = tab.name.substr(0, 1);
     // this.params.status = tab.name.substr(1, 1);
     this.getList();
+    sessionStorage.setItem('tabType', this.params.type)
   }
   private mounted() {
     const fullHeight =
@@ -307,7 +309,18 @@ export default class DiseaseInfo extends Vue {
       20;
     this.params.pageSize = Math.floor(fullHeight / 48); // 根据屏幕自适应计算size
     this.initData();
+    if( sessionStorage.getItem('searchDate')!=''){
+      this.searchDate =  sessionStorage.getItem('searchDate');
+       this.getList();
+    }
+    if(sessionStorage.getItem('tabType')!=''){
+      this.tabType = sessionStorage.getItem('tabType');
+      this.activeIndex = this.tabType;
+      this.params.type = this.tabType;
+      this.getList();
+    }
   }
+
   private initData() {
     this.getTotal();
     this.getList();
@@ -347,6 +360,7 @@ export default class DiseaseInfo extends Vue {
     this.expiryDate = this.$moment(this.searchDate).format('YYYY年MM月DD日');
     this.searchDate = this.$moment(this.searchDate).format('YYYY-MM-DD');
     this.initData();
+      sessionStorage.setItem('searchDate', this.searchDate);
   }
 
   private download() {
diff --git a/src/views/MenuList.vue b/src/views/MenuList.vue
index 44c3d06..8aef5de 100644
--- a/src/views/MenuList.vue
+++ b/src/views/MenuList.vue
@@ -102,6 +102,8 @@ export default class MenuList extends Vue {
       this.currentIndex = index;
       this.$router.push(this.routeList[index].path);
     }
+    sessionStorage.setItem('searchDate', '');
+    sessionStorage.setItem('tabType', '');
   }
 }
 </script>
diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue
index 5c1414e..26340d3 100644
--- a/src/views/PatientPortrayal.vue
+++ b/src/views/PatientPortrayal.vue
@@ -14,7 +14,7 @@
       <div class="layoutHome-left-image">
         <span class="left-text">{{currentSufferData.suffererName}}病情溯源</span>
       </div>
-      <div class="defined-back" @click="$router.go(-1)"></div>
+      <div class="defined-back" @click="back()"></div>
     </div>
     <div class="PatientPortrayal-bottom">
       <div
@@ -130,6 +130,7 @@ export default class LayoutHome extends Vue {
     total: 0,
     totalPage: 1,
   };
+  private searchDate = sessionStorage.getItem('searchDate');
   private created() {
     diseaseInfoServer
       .getDDHospitalEditDataIdNo(this.$route.query.id)
@@ -141,6 +142,8 @@ export default class LayoutHome extends Vue {
           this.currentSufferData.suffererIdNo = this.sufferData.idNo;
           this.getContentList();
           this.patientPortrayal(); // 开始调本人的溯源接口
+        }else if(res.data.code === '-100'){
+          this.$message.error('该患者暂时无法进行追溯');
         }
       });
   }
@@ -197,6 +200,14 @@ export default class LayoutHome extends Vue {
       }
     });
   }
+  private back(){
+    if(this.searchDate){
+       sessionStorage.setItem('searchDate', this.searchDate);
+       this.$router.go(-1);
+    }else{
+       this.$router.go(-1);
+    }
+  }
   private mounted() {
     const dom: any = document.getElementById('app');
     const that = this;
-- 
Gitee


From 0749b211095b00a3ba22f852b9c1621c3a26ff3d Mon Sep 17 00:00:00 2001
From: ChiyokoYY <525231835@qq.com>
Date: Tue, 10 Mar 2020 18:28:21 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E6=97=A5=E6=9C=9F=E5=92=8Ctab?=
 =?UTF-8?q?=E8=AE=B0=E5=BF=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccumulativeStatistics.vue                       | 12 ++++++------
 src/views/PatientPortrayal.vue                       |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
index aa8c1d2..9be6517 100644
--- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
+++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
@@ -221,7 +221,7 @@ import AccuItem from './AccuItem.vue';
   components: { AccuItem },
 })
 export default class DiseaseInfo extends Vue {
-  private tabType:any;
+  private tabType: any;
   private params = {
     nowPage: 1,
     pageSize: 10,
@@ -299,7 +299,7 @@ export default class DiseaseInfo extends Vue {
     this.params.type = tab.name.substr(0, 1);
     // this.params.status = tab.name.substr(1, 1);
     this.getList();
-    sessionStorage.setItem('tabType', this.params.type)
+    sessionStorage.setItem('tabType', this.params.type);
   }
   private mounted() {
     const fullHeight =
@@ -309,11 +309,11 @@ export default class DiseaseInfo extends Vue {
       20;
     this.params.pageSize = Math.floor(fullHeight / 48); // 根据屏幕自适应计算size
     this.initData();
-    if( sessionStorage.getItem('searchDate')!=''){
+    if ( sessionStorage.getItem('searchDate') != '') {
       this.searchDate =  sessionStorage.getItem('searchDate');
-       this.getList();
+      this.getList();
     }
-    if(sessionStorage.getItem('tabType')!=''){
+    if ( sessionStorage.getItem('tabType') != '') {
       this.tabType = sessionStorage.getItem('tabType');
       this.activeIndex = this.tabType;
       this.params.type = this.tabType;
@@ -360,7 +360,7 @@ export default class DiseaseInfo extends Vue {
     this.expiryDate = this.$moment(this.searchDate).format('YYYY年MM月DD日');
     this.searchDate = this.$moment(this.searchDate).format('YYYY-MM-DD');
     this.initData();
-      sessionStorage.setItem('searchDate', this.searchDate);
+    sessionStorage.setItem('searchDate', this.searchDate);
   }
 
   private download() {
diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue
index 26340d3..9565db3 100644
--- a/src/views/PatientPortrayal.vue
+++ b/src/views/PatientPortrayal.vue
@@ -142,7 +142,7 @@ export default class LayoutHome extends Vue {
           this.currentSufferData.suffererIdNo = this.sufferData.idNo;
           this.getContentList();
           this.patientPortrayal(); // 开始调本人的溯源接口
-        }else if(res.data.code === '-100'){
+        } else if (res.data.code === '-100') {
           this.$message.error('该患者暂时无法进行追溯');
         }
       });
@@ -200,11 +200,11 @@ export default class LayoutHome extends Vue {
       }
     });
   }
-  private back(){
-    if(this.searchDate){
+  private back() {
+    if (this.searchDate) {
        sessionStorage.setItem('searchDate', this.searchDate);
        this.$router.go(-1);
-    }else{
+    } else {
        this.$router.go(-1);
     }
   }
-- 
Gitee


From 7321c073943b748ae55d44471867813941284e77 Mon Sep 17 00:00:00 2001
From: ChiyokoYY <525231835@qq.com>
Date: Tue, 10 Mar 2020 19:14:58 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E6=A0=87=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccumulativeStatistics.vue                | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
index 9be6517..1270730 100644
--- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
+++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
@@ -2,9 +2,18 @@
   <div class="accumulativeStatistics">
     <div class="diseaseList-tool-bar">
       <span class="tool-bar-title">
-        累计数据统计分析(按报告地统计): 截止{{ expiryDate }}
+        累计数据统计分析(按居住地统计): 截止{{ expiryDate }}
         24时江夏统计数据如下
       </span>
+          <el-date-picker
+            v-model="searchDate"
+            type="date"
+            placeholder="选择日期"
+            size="small"
+            format="yyyy 年 MM 月 dd 日"
+            :picker-options="pickerOptions"
+            @change="refreshTabList"
+          ></el-date-picker>
     </div>
     <div class="main">
       <div class="main-top">
@@ -63,16 +72,7 @@
           >{{ tabData.yesterday }}0时-24时江夏区新增数据如下</span
         >-->
         <div class="block">
-          <span class="tool-bar-title">统计日期:</span>
-          <el-date-picker
-            v-model="searchDate"
-            type="date"
-            placeholder="选择日期"
-            size="small"
-            format="yyyy 年 MM 月 dd 日"
-            :picker-options="pickerOptions"
-            @change="refreshTabList"
-          ></el-date-picker>
+          <span class="tool-bar-title"> {{ expiryDate }}新增数据统计如下:</span>
         </div>
         <el-button type="primary" size="small" @click="download"
           >导出</el-button
-- 
Gitee


From 63781d34f2f56e737baff5ac0c63d04d0f5f9cc5 Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Tue, 10 Mar 2020 20:45:51 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BA=AF=E6=BA=90?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/feature/accumulativeStatistics.ts |  5 +++++
 src/views/PatientPortrayal.vue            | 27 ++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/api/feature/accumulativeStatistics.ts b/src/api/feature/accumulativeStatistics.ts
index 8f51d6d..b072020 100644
--- a/src/api/feature/accumulativeStatistics.ts
+++ b/src/api/feature/accumulativeStatistics.ts
@@ -35,4 +35,9 @@ export class AccumulativeStatistics {
     const url = `/infection/cdc/suffererinfo/trace?suffererIdNo=${opts.suffererIdNo}&suffererName=${opts.suffererName}`;
     return this.rSerivce.serverObj.get(url);
   }
+  // 通过身份证号 名字 cdc溯源详情导出
+  public suffererinfoTraceExport(opts: any) {
+    const url = `infection/cdc/trace/export?suffererIdNo=${opts.suffererIdNo}&suffererName=${opts.suffererName}`;
+    return this.downService.downloadRequest.get(url);
+  }
 }
diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue
index 9565db3..6ba7099 100644
--- a/src/views/PatientPortrayal.vue
+++ b/src/views/PatientPortrayal.vue
@@ -12,7 +12,7 @@
         <div class="cursor" v-if="item.changeInfo"></div>
       </div>cursor
       <div class="layoutHome-left-image">
-        <span class="left-text">{{currentSufferData.suffererName}}病情溯源</span>
+        <span class="left-text" @click="downloadTrace">{{currentSufferData.suffererName}}病情溯源</span>
       </div>
       <div class="defined-back" @click="back()"></div>
     </div>
@@ -207,6 +207,31 @@ export default class LayoutHome extends Vue {
     } else {
        this.$router.go(-1);
     }
+  }
+     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);
+    }
+  }
+  // 溯源导出
+  private downloadTrace() {
+    const params = {
+      suffererIdNo: this.currentSufferData.suffererIdNo,
+      suffererName: this.currentSufferData.suffererName,
+    };
+    accumulativeStatistics.suffererinfoTraceExport(params).then((res: any) => {
+        this.downloadFun(res);
+    });
   }
   private mounted() {
     const dom: any = document.getElementById('app');
-- 
Gitee


From b7e1bfa7b025aed19816cfafb685144778cfbc4e Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Tue, 10 Mar 2020 20:51:04 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BA=AF=E6=BA=90?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PatientPortrayal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue
index 6ba7099..c9096be 100644
--- a/src/views/PatientPortrayal.vue
+++ b/src/views/PatientPortrayal.vue
@@ -11,8 +11,8 @@
         <div class="text">{{item.changeInfo}}</div>
         <div class="cursor" v-if="item.changeInfo"></div>
       </div>cursor
-      <div class="layoutHome-left-image">
-        <span class="left-text" @click="downloadTrace">{{currentSufferData.suffererName}}病情溯源</span>
+      <div class="layoutHome-left-image" @click="downloadTrace">
+        <span class="left-text">{{currentSufferData.suffererName}}病情溯源</span>
       </div>
       <div class="defined-back" @click="back()"></div>
     </div>
-- 
Gitee


From db006fdf5a7d7cc83bf4a75327950a38127e1e70 Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Tue, 10 Mar 2020 20:54:10 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BA=AF=E6=BA=90?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PatientPortrayal.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue
index c9096be..137cf73 100644
--- a/src/views/PatientPortrayal.vue
+++ b/src/views/PatientPortrayal.vue
@@ -306,6 +306,7 @@ export default class LayoutHome extends Vue {
       top: 76px;
       left: 124px;
       background: url("../../src/assets/image/top-left.png");
+      cursor:pointer;
       .left-text {
         display: inline-block;
         margin-top: 10px;
-- 
Gitee


From dfd07d3b9ecdeba34c8a08b49943ce2952e75d76 Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Tue, 10 Mar 2020 20:57:15 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BA=AF=E6=BA=90?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PatientPortrayal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue
index 137cf73..1f3cbb5 100644
--- a/src/views/PatientPortrayal.vue
+++ b/src/views/PatientPortrayal.vue
@@ -10,7 +10,7 @@
         <div class="layoutHome-image" v-if="item.changeInfo"></div>
         <div class="text">{{item.changeInfo}}</div>
         <div class="cursor" v-if="item.changeInfo"></div>
-      </div>cursor
+      </div>
       <div class="layoutHome-left-image" @click="downloadTrace">
         <span class="left-text">{{currentSufferData.suffererName}}病情溯源</span>
       </div>
-- 
Gitee


From 4ee9911349107863ea082cd8cbfacabeb362cbd3 Mon Sep 17 00:00:00 2001
From: ChiyokoYY <525231835@qq.com>
Date: Tue, 10 Mar 2020 21:07:36 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E8=AE=B0=E5=BF=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/AccumulativeStatistics/AccumulativeStatistics.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
index 1270730..134b17a 100644
--- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
+++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
@@ -311,14 +311,14 @@ export default class DiseaseInfo extends Vue {
     this.initData();
     if ( sessionStorage.getItem('searchDate') != '') {
       this.searchDate =  sessionStorage.getItem('searchDate');
-      this.getList();
+      this.expiryDate =  sessionStorage.getItem('searchDate');
     }
     if ( sessionStorage.getItem('tabType') != '') {
       this.tabType = sessionStorage.getItem('tabType');
       this.activeIndex = this.tabType;
       this.params.type = this.tabType;
-      this.getList();
     }
+      this.initData();
   }
 
   private initData() {
-- 
Gitee


From 55f8e457aac4937e22d7267d9f10682ed6847d54 Mon Sep 17 00:00:00 2001
From: ChiyokoYY <525231835@qq.com>
Date: Tue, 10 Mar 2020 21:54:41 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E8=AE=B0=E5=BF=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/AccumulativeStatistics/AccumulativeStatistics.vue    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
index 134b17a..05fd83f 100644
--- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
+++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
@@ -308,7 +308,6 @@ export default class DiseaseInfo extends Vue {
       80 -
       20;
     this.params.pageSize = Math.floor(fullHeight / 48); // 根据屏幕自适应计算size
-    this.initData();
     if ( sessionStorage.getItem('searchDate') != '') {
       this.searchDate =  sessionStorage.getItem('searchDate');
       this.expiryDate =  sessionStorage.getItem('searchDate');
-- 
Gitee


From 03eb3536137daf70971581ef9311ddfcafb0b3ca Mon Sep 17 00:00:00 2001
From: "os.weiqiming" <847106154@qq.com>
Date: Wed, 11 Mar 2020 12:19:15 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PatientPortrayal.vue | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue
index 5fbc32f..74c8dbc 100644
--- a/src/views/PatientPortrayal.vue
+++ b/src/views/PatientPortrayal.vue
@@ -373,7 +373,7 @@ export default class LayoutHome extends Vue {
       &:nth-child(5) {
         position: absolute;
         top: 45px;
-        left: 987px;
+        left: 963px;
         .layoutHome-image {
           position: absolute;
           top: 42px;
@@ -388,7 +388,7 @@ export default class LayoutHome extends Vue {
       &:nth-child(6) {
         position: absolute;
         top: 43px;
-        left: 1169px;
+        left: 1100px;
         .layoutHome-image {
           position: absolute;
           top: 42px;
@@ -397,13 +397,13 @@ export default class LayoutHome extends Vue {
         .cursor {
           position: absolute;
           top: 76px;
-          left: -30px;
+          left: -18px;
         }
       }
       &:nth-child(7) {
         position: absolute;
         top: 38px;
-        right: 512px;
+        right: 565px;
         .layoutHome-image {
           position: absolute;
           top: 42px;
@@ -412,13 +412,28 @@ export default class LayoutHome extends Vue {
         .cursor {
           position: absolute;
           top: 76px;
-          left: -33px;
+          left: -20px;
         }
       }
       &:nth-child(8) {
+        position: absolute;
+        top: 40px;
+        right: 432px;
+        .layoutHome-image {
+          position: absolute;
+          top: 37px;
+          left: 28px;
+        }
+        .cursor {
+          position: absolute;
+          top: 73px;
+          left: -10px;
+        }
+      }
+      &:nth-child(9) {
         position: absolute;
         top: 35px;
-        right: 359px;
+        right: 300px;
         .layoutHome-image {
           position: absolute;
           top: 37px;
-- 
Gitee


From 10def04b651e132c3d934f9bf395dd34ed6c00e7 Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Wed, 11 Mar 2020 13:07:41 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=83=AD?=
 =?UTF-8?q?=E9=97=A8=E8=AF=8A=E7=96=AB=E6=83=85=E4=BA=BA=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/feature/diseaseInfoServer.ts          |  10 +
 .../AccumulativeStatistics.vue                |   4 +-
 .../DiseaseInfoFeverClinic/DiseaseInfoFR.vue  |  21 +
 .../DiseaseInfoFeverClinic/DiseaseList.vue    | 598 ++++++++++++++++
 .../DiseaseInfoFeverClinic/PeopleInfoAdd.vue  | 659 ++++++++++++++++++
 .../PeopleInfoDetail.vue                      | 101 +++
 .../DiseaseInfoFeverClinic/PeopleInfoEdit.vue | 560 +++++++++++++++
 src/router/router.ts                          |  34 +
 src/views/MenuList.vue                        |   5 +
 9 files changed, 1990 insertions(+), 2 deletions(-)
 create mode 100644 src/components/feature/DiseaseInfoFeverClinic/DiseaseInfoFR.vue
 create mode 100644 src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue
 create mode 100644 src/components/feature/DiseaseInfoFeverClinic/PeopleInfoAdd.vue
 create mode 100644 src/components/feature/DiseaseInfoFeverClinic/PeopleInfoDetail.vue
 create mode 100644 src/components/feature/DiseaseInfoFeverClinic/PeopleInfoEdit.vue

diff --git a/src/api/feature/diseaseInfoServer.ts b/src/api/feature/diseaseInfoServer.ts
index 6ac78a2..84451e6 100644
--- a/src/api/feature/diseaseInfoServer.ts
+++ b/src/api/feature/diseaseInfoServer.ts
@@ -132,6 +132,11 @@ export class DiseaseInfoServer {
     const url = '/infection/cdc/list';
     return this.rSerivce.serverObj.post(url, opts);
   }
+  // 获取发热门诊疫情人员列表
+  public getFeverClinicList(opts: any) {
+    const url = '/infection/clinics/list';
+    return this.rSerivce.serverObj.post(url, opts);
+  }
   // 获取疫情网疫情病例分类
   public getSickTypeist() {
     const url = '/infection/cdc/findClinicalSeverity';
@@ -190,6 +195,11 @@ export class DiseaseInfoServer {
     const url = `/infection/cdc/suffererinfo/one?id=${id}`;
     return this.rSerivce.serverObj.get(url);
   }
+  // 发热门诊疫情人员详情
+  public getFeverClinicDetail(id: any) {
+    const url = `/infection/clinics/detail?id=${id}`;
+    return this.rSerivce.serverObj.get(url);
+  }
 
   // 隔离点数据对比
   public dataCompare() {
diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
index 1270730..47997f4 100644
--- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
+++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue
@@ -309,11 +309,11 @@ export default class DiseaseInfo extends Vue {
       20;
     this.params.pageSize = Math.floor(fullHeight / 48); // 根据屏幕自适应计算size
     this.initData();
-    if ( sessionStorage.getItem('searchDate') != '') {
+    if ( sessionStorage.getItem('searchDate') !== '') {
       this.searchDate =  sessionStorage.getItem('searchDate');
       this.getList();
     }
-    if ( sessionStorage.getItem('tabType') != '') {
+    if ( sessionStorage.getItem('tabType') !== '') {
       this.tabType = sessionStorage.getItem('tabType');
       this.activeIndex = this.tabType;
       this.params.type = this.tabType;
diff --git a/src/components/feature/DiseaseInfoFeverClinic/DiseaseInfoFR.vue b/src/components/feature/DiseaseInfoFeverClinic/DiseaseInfoFR.vue
new file mode 100644
index 0000000..de39609
--- /dev/null
+++ b/src/components/feature/DiseaseInfoFeverClinic/DiseaseInfoFR.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: 'DiseaseInfoYQ',
+})
+export default class DiseaseInfoYQ extends Vue {}
+</script>
+<style scoped lang="less">
+.diseaseList {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue
new file mode 100644
index 0000000..b03a4fe
--- /dev/null
+++ b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue
@@ -0,0 +1,598 @@
+<template>
+  <div class="diseaseList">
+    <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"
+        label-width="130px"
+        demo-form-inline
+      >
+        <el-form-item label="姓名:">
+          <el-input
+            v-model="queryInfo.suffererName"
+            placeholder="请输入"
+            @input="query('input')"
+            style="width:100%"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号:">
+          <el-input
+            v-model="queryInfo.idNo"
+            placeholder="请输入"
+            @input="query('input')"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="手机号:">
+          <el-input
+            v-model="queryInfo.telphone"
+            placeholder="请输入"
+            @input="query('input')"
+          ></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="主要症状:">
+          <el-select
+            v-model="queryInfo.caseType"
+            placeholder="请选择"
+            @change="query"
+          >
+            <el-option
+              v-for="(item, index) in symptomTypeList"
+              :key="index"
+              :label="item.name"
+              :value="item.code"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item label="病例分类:">
+          <el-select
+            v-model="queryInfo.caseType"
+            placeholder="请选择"
+            @change="query"
+            style="width:100%"
+          >
+            <el-option
+              v-for="(item, index) in caseTypeList"
+              :key="index"
+              :label="item.name"
+              :value="item.code"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <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="suffererName"
+            label="姓名"
+            width="90px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column
+            prop="sex"
+            label="性别"
+            width="70px"
+          ></el-table-column>
+          <el-table-column
+            prop="age"
+            label="年龄"
+            width="70px"
+          ></el-table-column>
+          <el-table-column
+            prop="idNo"
+            label="身份证号"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column prop="telphone" label="手机号"></el-table-column>
+          <el-table-column
+            prop="syptom"
+            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="hospital"
+            label="发热门诊医院"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <!-- <el-table-column
+            prop="curStatus"
+            label="当前状态"
+            :show-overflow-tooltip="true"
+            min-width="100px"
+          ></el-table-column> -->
+
+          <!-- <el-table-column
+            prop="detailedAddress"
+            label="家庭住址"
+            :show-overflow-tooltip="true"
+            min-width="100px"
+          ></el-table-column> -->
+          <el-table-column label="操作" width="180">
+            <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 = {
+    caseType: 0,
+    clinicalSeverity: '',
+    curStatus: '',
+    page: 1,
+    size: 10,
+    idNo: '',
+    suffererName: '',
+    telphone: '',
+  };
+
+  // 总条数
+  private total: number = 0;
+
+  // 查询时间
+  private queryDate: any[] = [];
+
+  // 病例分类下拉框数据
+  private clinicalSeverityList: any[] = [];
+
+  // 主要症状分类下拉框数据
+  private symptomTypeList: any[] = [];
+
+  // 当前状态下拉框数据
+  private curStatusList: any[] = [];
+
+  // 查询节流阀
+  private queryTimer: any = null;
+
+  // 时间组件配置
+  // private pickerOptions: object = {
+  //   disabledDate(time: any) {
+  //     return (
+  //       time.getTime() >
+  //       new Date(
+  //         new Date(new Date().toLocaleDateString()).getTime() +
+  //           24 * 60 * 60 * 1000 -
+  //           1,
+  //       )
+  //     );
+  //   },
+  // };
+
+  private created() {
+    this.sourceType = localStorage.getItem('sourcetype');
+    this.getList();
+    this.getSuffererStatus();
+    // this.getPatientTypeList();
+    this.getcurStatusList();
+  }
+
+  // 获取发热门诊疫情人员列表
+  private async getList() {
+    const res = await diseaseInfoServer.getFeverClinicList(this.queryInfo);
+    this.total = res.data.data.totalElements;
+    this.tableData = res.data.data.content;
+  }
+
+  // 病情程度下拉列表
+  private async getSuffererStatus() {
+    const res = await diseaseInfoServer.getSickTypeist();
+    if (res.status !== 200) {
+      return;
+    }
+    this.clinicalSeverityList = res.data.data;
+  }
+
+  // 主要症状分类下拉框
+  // private async getPatientTypeList() {
+  //   const res = await diseaseInfoServer.getIllssDegreeneList();
+  //   if (res.status !== 200) {
+  //     return;
+  //   }
+  //   this.symptomTypeList = res.data.data;
+  // }
+
+  // 当前状态下拉框
+  private async getcurStatusList() {
+    const res = await diseaseInfoServer.getCurrentStatusList();
+    if (res.status !== 200) {
+      return;
+    }
+    this.curStatusList = 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) {
+      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 reset() {
+    this.queryInfo.caseType = 0;
+    this.queryInfo.clinicalSeverity = '';
+    this.queryInfo.curStatus = '';
+    this.queryInfo.idNo = '';
+    this.queryInfo.suffererName = '';
+    this.queryInfo.telphone = '';
+    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 {
+  height: 100%;
+  overflow: hidden;
+  .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-query-form .el-form {
+    padding: 0 10px 0 0;
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+    border-bottom: 1px solid #dcdfe6;
+    .el-form-item {
+      margin: 10px 0;
+      width: 30%;
+      display: flex;
+    }
+  }
+
+  .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;
+    }
+  }
+}
+</style>
diff --git a/src/components/feature/DiseaseInfoFeverClinic/PeopleInfoAdd.vue b/src/components/feature/DiseaseInfoFeverClinic/PeopleInfoAdd.vue
new file mode 100644
index 0000000..2358b37
--- /dev/null
+++ b/src/components/feature/DiseaseInfoFeverClinic/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/DiseaseInfoFeverClinic/PeopleInfoDetail.vue b/src/components/feature/DiseaseInfoFeverClinic/PeopleInfoDetail.vue
new file mode 100644
index 0000000..a2a3b7c
--- /dev/null
+++ b/src/components/feature/DiseaseInfoFeverClinic/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/DiseaseInfoFeverClinic/PeopleInfoEdit.vue b/src/components/feature/DiseaseInfoFeverClinic/PeopleInfoEdit.vue
new file mode 100644
index 0000000..a5b1d34
--- /dev/null
+++ b/src/components/feature/DiseaseInfoFeverClinic/PeopleInfoEdit.vue
@@ -0,0 +1,560 @@
+<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="telphone">
+                  <el-input
+                    v-model="editInfo.telphone"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="就诊时间:" prop="consultationTime">
+                  <el-input
+                    v-model="editInfo.consultationTime"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="发热门诊医院:" prop="hospital">
+                  <el-input
+                    v-model="editInfo.hospital"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="主要症状:" prop="syptom">
+                  <el-input
+                    v-model="editInfo.syptom"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="患者来源:" prop="source">
+                  <el-input
+                    v-model="editInfo.source"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="患者去向:" prop="direction">
+                  <el-input
+                    v-model="editInfo.direction"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <el-form-item label="居住地址:" prop="address">
+                  <el-input
+                  type="textarea"
+                    v-model="editInfo.address"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <el-form-item label="备注:">
+                  <el-input
+                  type="textarea"
+                    v-model="editInfo.remark"
+                    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: '',
+
+  };
+
+  // 病患类型下拉框数据
+  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.getPatientInfo();
+    this.ruleFormObjUp = this.$refs.ruleFormUp;
+    this.ruleFormObjDown = this.$refs.ruleFormDown;
+  }
+
+  private getPatientInfo() {
+    diseaseInfoServer.getFeverClinicDetail(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 441ef09..2710f50 100644
--- a/src/router/router.ts
+++ b/src/router/router.ts
@@ -15,6 +15,12 @@ import PeopleInfoAddYQ from '../components/feature/DiseaseInfoYQ/PeopleInfoAdd.v
 import PeopleInfoEditYQ from '../components/feature/DiseaseInfoYQ/PeopleInfoEdit.vue'; // 人员编辑
 import PeopleInfoDetailYQ from '../components/feature/DiseaseInfoYQ/PeopleInfoDetail.vue'; // 病情追溯
 
+import DiseaseInfoFR from '../components/feature/DiseaseInfoFeverClinic/DiseaseInfoFR.vue'; // 发热门诊疫情人员列表
+import DiseaseListFR from '../components/feature/DiseaseInfoFeverClinic/DiseaseList.vue'; // 疫情信息列表页面
+import PeopleInfoAddFR from '../components/feature/DiseaseInfoFeverClinic/PeopleInfoAdd.vue'; // 人员新增/转入
+import PeopleInfoEditFR from '../components/feature/DiseaseInfoFeverClinic/PeopleInfoEdit.vue'; // 人员编辑
+import PeopleInfoDetailFR from '../components/feature/DiseaseInfoFeverClinic/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'; // 人员新增/转入
@@ -85,6 +91,34 @@ const router = new Router({
             },
           ],
         },
+        {
+          path: 'DiseaseInfoFR',
+          redirect: '/LayoutHome/DiseaseInfoFR/DiseaseList',
+          name: 'DiseaseInfoFR',
+          component: DiseaseInfoFR,
+          children: [
+            {
+              path: 'DiseaseList',
+              name: 'DiseaseListFR',
+              component: DiseaseListFR,
+            },
+            {
+              path: 'PeopleInfoAdd',
+              name: 'PeopleInfoAddFR',
+              component: PeopleInfoAddFR,
+            },
+            {
+              path: 'PeopleInfoEdit/:id',
+              name: 'PeopleInfoEditFR',
+              component: PeopleInfoEditFR,
+            },
+            {
+              path: 'PeopleInfoDetail/:id',
+              name: 'PeopleInfoDetailFR',
+              component: PeopleInfoDetailFR,
+            },
+          ],
+        },
         {
           path: 'DiseaseInfoGL',
           redirect: '/LayoutHome/DiseaseInfoGL/DiseaseList',
diff --git a/src/views/MenuList.vue b/src/views/MenuList.vue
index 8aef5de..d58941a 100644
--- a/src/views/MenuList.vue
+++ b/src/views/MenuList.vue
@@ -54,6 +54,11 @@ export default class MenuList extends Vue {
       path: '/LayoutHome/DiseaseInfoHospitalDD',
       authority: '4',
     },
+    {
+      name: '发热门诊疫情人员列表',
+      path: '/LayoutHome/DiseaseInfoFR',
+      authority: '5',
+    },
     {
       name: '疫情网数据统计',
       path: '/LayoutHome/AccumulativeStatistics',
-- 
Gitee