diff --git a/src/api/followup.js b/src/api/followup.js
index b26fd90fee73c9f985f27598c5fdcc0bc613cead..c6f7a48c1bcf01cabbf992db4d186427c7ed8297 100644
--- a/src/api/followup.js
+++ b/src/api/followup.js
@@ -15,7 +15,7 @@ export function getFollowSurvey(params = {}) {
 //审核质控 随访
 export function getFollowCheck(params = {}) {
   return request({
-    url: "/follow/check/:patientFrom",
+    url: "/disease-data/follow/check/patientFrom",
     method: "get",
     params,
   });
diff --git a/src/components/FormComponents/index.vue b/src/components/FormComponents/index.vue
index efdf5363d5e5742678425bc1249e4bd2b7f59a1a..670138e3a6aa5d99c4d4efbb1d3b74640fab6f6e 100644
--- a/src/components/FormComponents/index.vue
+++ b/src/components/FormComponents/index.vue
@@ -230,6 +230,7 @@ export default {
     inlineFlag: { type: Boolean, default: false },
     forms: { type: Array }, // 表单组,
     lists: { type: Array }, // 按钮组
+    formEdit:{type: Object}
   },
   data() {
     const form = {}
@@ -322,6 +323,11 @@ export default {
       this.modifiedFlag = !this.modifiedFlag
     },
   },
+  watch: {
+    formEdit(val){
+      this.initforms(val)
+    }
+  }
 }
 </script>
 
diff --git a/src/views/followupentry/index.vue b/src/views/followupentry/index.vue
index d20a39d6b71c19f0932561e3662dba25c878d6f6..f6be79711d8c18623502dbb8a686a65932c43f6c 100644
--- a/src/views/followupentry/index.vue
+++ b/src/views/followupentry/index.vue
@@ -16,8 +16,19 @@ export default {
     return {
     }
   },
-  created() {},
+  created() {
+  },
+  computed:{
+    formEdit(){
+      return this.$route.query
+    }
+  },
   methods: {},
+  provide() {
+    return {
+      formEdit:this.$route.query.formEdit
+    }
+  },
 }
 </script>
 
diff --git a/src/views/followupresearch/index.vue b/src/views/followupresearch/index.vue
index b8e3487a16929c3ca0baa5bb7dbe06f99d081e13..aa4e0acae4809961d48763f85f5364a472da27c7 100644
--- a/src/views/followupresearch/index.vue
+++ b/src/views/followupresearch/index.vue
@@ -2,7 +2,7 @@
   <!-- 随访调查 -->
   <div class="screeningSearch">
     <div class="top">
-      <form-components :forms="formList" @handleSearch="onSearch"></form-components>
+      <form-components :forms="formList" :formEdit="formEdit" @handleSearch="onSearch"></form-components>
     </div>
     <div class="bot">
       <customs-table
@@ -119,7 +119,65 @@ export default {
           ],
         },
       ],
-      tableData: [],
+      tableData: [
+        {
+          "patientId": "1598222607734341634",
+          "name": "小飞", //姓名
+          "idCard": "340822199510260215", //身份证
+          "phone": "18311112222", //手机号
+          "sex": 1, //性别
+          "birthday": "2022-12-31 00:00:00", //生日
+          "age": 18, //年龄
+          "id": "", //id
+          "unionName": "合肥高新附院", //医联体名称
+          "screeningTime": "2022-12-01 00:00:00", //筛查时间
+          "riskRank": "", //风险等级
+          "followTime": "", //随访时间
+          "followContents": "", //随访内容
+          "nextFollowTime": "", //计划随访时间
+          "followBatch": 0, //随访进度
+          "unionId": "2", //联盟id
+          "riskScore": "", //风险分数
+          "screeningAdvise": "", //筛查建议
+          "formRecordId": "", //表单记录id
+          "linkPhone": "0556-5556666", //联系方式
+          "isContinueFollow": 1, //是否继续随访
+          "checkStatus": "" //审核状态
+          },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+        {
+          name:'11',
+        },
+      ],//调试
       formList: [
         {
           xs: 24,
@@ -213,17 +271,25 @@ export default {
           ],
         },
       ],
-      // pageSize:1,
-      // pageNum:10,
-      // totalCount:20
+      formEdit:{}
+    }
+  },
+  watch: {
+    pageSize(val){
+      sessionStorage.setItem('followResearch-pageSize',val)
+    },
+    pageIndex(val){
+      sessionStorage.setItem('followResearch-pageIndex',val)
     }
   },
-  watch: {},
   created(){
     this.initColumn()
   },
   mounted() {
-    this.handleSearch()
+    this.formEdit = JSON.parse(sessionStorage.getItem('followResearch-form')) ||{}
+    this.pageSize = Number(sessionStorage.getItem('followResearch-pageSize')) || 1
+    this.pageIndex = Number(sessionStorage.getItem('followResearch-pageIndex')) || 10
+    // this.handleSearch() //调试注释
   },
   methods: {
     changeModified() {
@@ -240,17 +306,23 @@ export default {
       this.$refs.customTable.loading = false
     },
     onSearch(form) {
-      console.log(form)
+      sessionStorage.setItem('followResearch-form',JSON.stringify(form))
+      this.formEdit = form
+      this.handleSearch()
     },
     rowOpration(data, i) {
-      console.log(data, i)
-      this.$router.push("/followupentry")
+      console.log('跳转',data, i)
+      this.$router.push({path:"/followupentry",query:{formEdit:JSON.stringify(data)}})
     },
     async handleSearch(){
+      this.listLoading = true
       let params={
         pageSize:this.pageSize,
         pageNum:this.pageIndex
       }
+      if(this.formEdit){
+        params=Object.assign(this.formEdit,params)
+      }
       let res = await getFollowSurvey(params)
       if(res.code==1){
         //分页内容
@@ -258,6 +330,7 @@ export default {
         this.total= d.total
         this.tableData=d['records']
       }
+      this.listLoading = false
     },
     initColumn(){
       this.columns.forEach((item,index) => {
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index 4bf08b2f6db2c6ff07c550246a4aad08441d5cd5..a6dd43e8123c0cc77158d5ec1afbbbac933e4bb9 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -143,6 +143,7 @@ export default {
   },
   created() {
     // 字典formType 1 筛查表单
+    // console.log('回显2',this.formEdit)
     this.getCurrentFormByType(this.formType)
   },
   watch: {
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index 39ce47dd2e93164be66f15f4026fea58222dc0da..39428fb9fffe00eb9d41dc0d9ad4ff0a54e2b083 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -91,7 +91,7 @@ export default {
     patientStandbyId: String,
     getAll: Boolean, // 获取页面所有数据
     survivalFlag: Boolean, //存活的显示
-    formInitial: {}, // 第四步的数据
+    formEdit: Object,
   },
   provide() {
     return {
@@ -555,6 +555,36 @@ export default {
       })
     },
   },
+  watch: {
+    formEdit(val) {
+      console.log("回显3", val)
+    },
+  },
+  created() {
+    if (this.$route.query.formEdit) {
+      this.formData.formEdit = this.$route.query.formEdit
+    }
+    this.initForm()
+    if (this.getAll) {
+      // 监听patientId 获取页面所有数据
+      this.$watch(
+        "patientId",
+        () => {
+          this.initData()
+        },
+        { immediate: true }
+      )
+    } else {
+      // 监听form.silent 获取当前tab页数据
+      this.$watch(
+        "form.silent",
+        () => {
+          this.initData()
+        },
+        { immediate: true }
+      )
+    }
+  },
 }
 </script>
 <style scoped lang="scss">