diff --git a/src/components/follow/AsbitemCriticalValue.vue b/src/components/follow/AsbitemCriticalValue.vue
index d2ad059..7f5440f 100644
--- a/src/components/follow/AsbitemCriticalValue.vue
+++ b/src/components/follow/AsbitemCriticalValue.vue
@@ -130,24 +130,25 @@ import { mapState } from "vuex";
 import { dddw } from "../../utlis/proFunc";
 import { getapi, postapi, putapi, deletapi } from "../../api/api";
 export default {
+  props: ['refParams'],
   data() {
     return {
       asbitemCriticalValue: [],
     };
   },
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
+    ...mapState(["window", "dict"]),
   },
   methods: {
     dddw,
     moment,
     getLists() {
-      if (this.dataTransOpts.tableS.patient_register.patientRegisterId) {
+      if (this.refParams.patientRegisterId) {
         postapi(
           "/api/app/PhoneFollowUp/GetAsbitemOrItemCriticalByPatientRegisterId",
           {
             patientRegisterId:
-              this.dataTransOpts.tableS.patient_register.patientRegisterId,
+              this.refParams.patientRegisterId,
           }
         ).then((res) => {
           if (res.code > -1) this.asbitemCriticalValue = res.data;
@@ -207,14 +208,15 @@ export default {
   },
   watch: {
     //人员ID未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_check_asbitem.M": {
+    "refParams.brushTimes": {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(
-          `watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`
+          `watch 危急值 newVal:${newVal} oldVal:${oldVal} followUpId: ${this.refParams.followUpId}`
         );
-        // if (newVal != oldVal)
-        this.getLists();
+        if (newVal != oldVal){
+          this.getLists();
+        }        
       },
     },
   },
diff --git a/src/components/follow/FollowList.vue b/src/components/follow/FollowList.vue
index a7963ee..3e993f2 100644
--- a/src/components/follow/FollowList.vue
+++ b/src/components/follow/FollowList.vue
@@ -130,13 +130,13 @@
         <!-- 组合项目  基本信息  -->
         <el-tabs v-model="tabChoosed">
           <el-tab-pane label="危急值" name="1">
-            <AsbitemCriticalValue />
+            <AsbitemCriticalValue :refParams="refParams"/>
           </el-tab-pane>
           <el-tab-pane label="电话随访" name="2">
-            <PhoneFollowUp />
+            <PhoneFollowUp :refParams="refParams"/>
           </el-tab-pane>
           <el-tab-pane label="短信随访" name="3">
-            <SmsSend />
+            <SmsSend :refParams="refParams"/>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -342,6 +342,13 @@ export default {
       },
       LocalConfigInit: {},
       columnData: [],
+      // 子组件传参
+      refParams:{
+        followUpId:'',  // 随访主表ID
+        patientRegisterId:'', // 人员ID
+        criticalValueContents:'', // 随访原因
+        brushTimes:0, // 人员ID未变时，亦可控制刷新
+      }
     };
   },
 
@@ -385,8 +392,7 @@ export default {
   },
   computed: {
     ...mapState([
-      "window",
-      "dataTransOpts",
+      "window",      
       "dialogWin",
       "dict",
       "elProgress",
@@ -451,23 +457,26 @@ export default {
 
     //点击体检次数行
     rowClick(row) {
-
-      this.dataTransOpts.tableS.patient_register = deepCopy(row);
+    
       this.tableDataCurrentRow = deepCopy(row);
-      this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新
+      this.refParams.followUpId = row.followUpId
+      this.refParams.patientRegisterId = row.patientRegisterId
+      this.refParams.criticalValueContents = row.criticalValueContents
+      this.refParams.brushTimes++; //触发所选组合项目刷新
       // }
     },
 
     //查询
     async Query() {
       // 查询时，清掉明细数据 （滚动时不清）
-      this.dataTransOpts.tableS.patient_register.followUpId = "";
-      this.dataTransOpts.tableS.patient_register.patientRegisterId = "";
+      this.refParams.followUpId = "";
+      this.refParams.patientRegisterId = "";
+      this.refParams.criticalValueContents = ""
       this.tableDataCurrentRow = {}; // 清除选择
       this.tableData = [];
 
       setTimeout(() => {
-        this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新
+        this.refParams.brushTimes++; //触发所选组合项目刷新
       }, 10);
 
       this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit);
@@ -619,8 +628,8 @@ export default {
           this.tableData = res.data;
           this.makeFollowInfo();
           //如果 有选中 记录，则刷新其对应的组合项目
-          if (this.dataTransOpts.tableS.patient_register.patientRegisterId) {
-            this.dataTransOpts.refresh.register_check_asbitem.M++;
+          if (this.refParams.patientRegisterId) {
+            this.refParams.brushTimes++;
           }
         }
       });
@@ -785,18 +794,18 @@ export default {
 
   //监听事件
   watch: {
-    "patientRegister.query.customerOrgId": {
-      // immediate: true, // 立即执行
-      // deep: true, // 深度监听复杂类型内变化
-      handler(newVal, oldVal) {
-        //// console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
-        // 单位变化时，清除当前列表信息
-        if (newVal && newVal != oldVal) {
-          this.tableData = [];
-          this.dataTransOpts.tableM.register_check_asbitem = [];
-        }
-      },
-    },
+    // "patientRegister.query.customerOrgId": {
+    //   // immediate: true, // 立即执行
+    //   // deep: true, // 深度监听复杂类型内变化
+    //   handler(newVal, oldVal) {
+    //     //// console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
+    //     // 单位变化时，清除当前列表信息
+    //     if (newVal && newVal != oldVal) {
+    //       this.tableData = [];
+    //       this.dataTransOpts.tableM.register_check_asbitem = [];
+    //     }
+    //   },
+    // },
 
     //触发查询事件
     "patientRegister.query.times"(newVal, oldVal) {
diff --git a/src/components/follow/PhoneFollowUp.vue b/src/components/follow/PhoneFollowUp.vue
index 6897896..2641d38 100644
--- a/src/components/follow/PhoneFollowUp.vue
+++ b/src/components/follow/PhoneFollowUp.vue
@@ -47,13 +47,36 @@
     </div>
     <el-dialog :title="title == 1 ? '新增' : '修改'" :visible.sync="dialogVisible" width="800px"
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" label-width="80px">
+      <el-form ref="form" :model="form" label-width="80px" :rules="rules">
         <el-row>
-          <el-col :span="title == 1 ? '4' : '6'">
+          <el-col :span="6">
             <el-form-item label="编号">
               <el-input v-model="form.id" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4" v-if="title != 1">
+            <el-form-item label="是否完成">
+              <el-checkbox v-model="form.isComplete" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="随访来源" prop="followUpSourceId">
+              <el-select v-model="form.followUpSourceId" placeholder="随访来源" size="small">
+                <el-option v-for="item in dict.followUpSources" :key="item.id" :label="item.displayName"
+                  :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="随访类型" prop="followUpTypeId">
+              <el-select v-model="form.followUpTypeId" placeholder="随访来源" size="small">
+                <el-option v-for="item in dict.followUpTypes" :key="item.id" :label="item.displayName"
+                  :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6" v-if="title == 1">
             <el-form-item label="生成模式">
               <el-select v-model="mode" placeholder="生成模式" size="small">
@@ -74,26 +97,21 @@
           <el-col :span="4" v-if="title == 1 && mode == 1">
             <el-form-item label="开始时间">
               <el-date-picker placeholder="选择日期时间" size="small" v-model="form.startDate" value-format="yyyy-MM-dd"
-                editable style="width: 177px">
+                editable style="width: 115px">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="4" v-if="title == 1 && mode == 0">
             <el-form-item label="随访日期">
               <el-date-picker placeholder="选择日期时间" size="small" v-model="form.planFollowDate" value-format="yyyy-MM-dd"
-                editable style="width: 177px">
+                editable style="width: 115px">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4" v-if="title != 1">
-            <el-form-item label="是否完成">
-              <el-checkbox v-model="form.isComplete" true-label="Y" false-label="N" />
-            </el-form-item>
-          </el-col>
           <el-col :span="4" v-if="title != 1">
             <el-form-item label="随访日期">
               <el-date-picker placeholder="选择日期时间" size="small" v-model="form.planFollowDate" value-format="yyyy-MM-dd"
-                editable style="width: 177px">
+                editable style="width: 115px">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -163,6 +181,7 @@ import { getapi, postapi, putapi, deletapi } from "../../api/api";
 
 export default {
   components: {},
+  props: ['refParams'],
   data() {
     return {
       phoneFollowUp: [], // 电话随访
@@ -177,8 +196,20 @@ export default {
         generateCount: "",
         intervalDays: "",
         generateCount: "",
-        replyContent: ""
+        replyContent: "",
+        followUpSourceId: "03",  // 01-医生站，02-总检医生站,03-客服，99-其它
+        followUpTypeId: "01" // 01-普通，02-复查，03-危急值，99-其它,01-30为系统保留，31以后给客户自定义用
+      },
+
+      rules: {
+        followUpSourceId: [
+          { required: true, message: "请填写随访来源", trigger: "blur" },
+        ],
+        followUpTypeId: [
+          { required: true, message: "请填写随访类型", trigger: "blur" },
+        ]
       },
+
       mode: "0",
       modes: [
         {
@@ -212,7 +243,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
+    ...mapState(["window",  "dict" ]),
   },
   methods: {
     dddw,
@@ -224,11 +255,23 @@ export default {
       postapi("/api/app/Asbitem/GetSimpleAsbitemWithDetails").then((res) => {
         if (res.code > -1) this.asbItems = res.data;
       });
+
+      // 获取随访来源
+      postapi("/api/app/FollowUpSource/GetList").then((res) => {
+        if (res.code > -1) this.dict.followUpSources = res.data;
+      });
+
+      // 获取随访类型
+      postapi("/api/app/FollowUpType/GetList").then((res) => {
+        if (res.code > -1) this.dict.followUpTypes = res.data;
+      });
+
+
     },
     getLists() {
-      if (this.dataTransOpts.tableS.patient_register.followUpId) {
+      if (this.refParams.followUpId) {
         postapi("/api/app/PhoneFollowUp/GetList", {
-          followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+          followUpId: this.refParams.followUpId,
         }).then((res) => {
           if (res.code > -1) this.phoneFollowUp = res.data;
         });
@@ -237,36 +280,55 @@ export default {
       }
     },
     addoredit() {
-      if (this.title == 1) {
-        if (this.mode == 1) {
-          if (this.form.intervalDays == "") {
-            this.$message.warning("请输入间隔天数");
-          } else if (this.form.startDate == "") {
-            this.$message.warning("请选择开始时间");
-          } else if (this.form.generateCount == "") {
-            this.$message.warning("请输入生成次数");
-          } else {
-            postapi("/api/app/PhoneFollowUp/AutoCreate", {
-              followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
-              intervalDays: this.form.intervalDays,
-              startDate: this.form.startDate,
-              followUpContent: this.form.followUpContent,
-              generateCount: this.form.generateCount,
-            }).then((res) => {
-              if (res.code > -1) {
-                this.getLists();
-                this.dialogVisible = false;
-                this.mode = "0";
-              }
-            });
-          }
-        } else if (this.mode == 0) {
-          if (this.form.planFollowDate == "") {
-            this.$message.warning("请选择随访日期");
+      this.$refs['form'].validate((valid, fields) => {
+        // console.log('fields', fields)
+        if (!valid) {
+          this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message });
+          return false
+        }
+        if (this.title == 1) {
+          if (this.mode == 1) {
+            if (this.form.intervalDays == "") {
+              this.$message.warning("请输入间隔天数");
+            } else if (this.form.startDate == "") {
+              this.$message.warning("请选择开始时间");
+            } else if (this.form.generateCount == "") {
+              this.$message.warning("请输入生成次数");
+            } else {
+              postapi("/api/app/PhoneFollowUp/AutoCreate", {
+                followUpId: this.refParams.followUpId,
+                intervalDays: this.form.intervalDays,
+                startDate: this.form.startDate,
+                followUpContent: this.form.followUpContent,
+                generateCount: this.form.generateCount,
+              }).then((res) => {
+                if (res.code > -1) {
+                  this.getLists();
+                  this.dialogVisible = false;
+                  this.mode = "0";
+                }
+              });
+            }
+          } else if (this.mode == 0) {
+            if (this.form.planFollowDate == "") {
+              this.$message.warning("请选择随访日期");
+            } else {
+              postapi("/api/app/PhoneFollowUp/Create", {
+                followUpId: this.refParams.followUpId,
+                planFollowDate: this.form.planFollowDate,
+                followUpContent: this.form.followUpContent,
+                replyContent: this.form.replyContent,
+              }).then((res) => {
+                if (res.code > -1) {
+                  this.getLists();
+                  this.dialogVisible = false;
+                  this.mode = "0";
+                }
+              });
+            }
           } else {
-            postapi("/api/app/PhoneFollowUp/Create", {
-              followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
-              planFollowDate: this.form.planFollowDate,
+            postapi("/api/app/PhoneFollowUp/CreateThreeMonthPlan", {
+              followUpId: this.refParams.followUpId,
               followUpContent: this.form.followUpContent,
               replyContent: this.form.replyContent,
             }).then((res) => {
@@ -278,10 +340,12 @@ export default {
             });
           }
         } else {
-          postapi("/api/app/PhoneFollowUp/CreateThreeMonthPlan", {
-            followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+          postapi("/api/app/PhoneFollowUp/Update", {
+            phoneFollowUpId: this.form.id,
+            planFollowDate: this.form.planFollowDate,
             followUpContent: this.form.followUpContent,
             replyContent: this.form.replyContent,
+            isComplete: this.form.isComplete,
           }).then((res) => {
             if (res.code > -1) {
               this.getLists();
@@ -290,21 +354,7 @@ export default {
             }
           });
         }
-      } else {
-        postapi("/api/app/PhoneFollowUp/Update", {
-          phoneFollowUpId: this.form.id,
-          planFollowDate: this.form.planFollowDate,
-          followUpContent: this.form.followUpContent,
-          replyContent: this.form.replyContent,
-          isComplete: this.form.isComplete,
-        }).then((res) => {
-          if (res.code > -1) {
-            this.getLists();
-            this.dialogVisible = false;
-            this.mode = "0";
-          }
-        });
-      }
+      })
     },
     rowick(row) {
       this.curRow = { ...row };
@@ -330,7 +380,7 @@ export default {
       this.dialogVisible = true;
       this.title = 1;
       this.form = this.$options.data().form;
-      let followUpContent = this.dataTransOpts.tableS.patient_register.criticalValueContents
+      let followUpContent = this.refParams.criticalValueContents
       do {
         followUpContent = followUpContent.replace('<br>', '\r\n')
       } while (followUpContent.includes('<br>'));
@@ -389,11 +439,11 @@ export default {
         { value: "本人已接电话，已通知避免过度劳累，必要时医院复查。" },
         { value: "本人已接电话，xxxxx，已做手术，正在恢复期。" },
       ];
-      if(queryString){
+      if (queryString) {
         restaurants.filter(e => {
-          if(e.value.toUpperCase().includes(queryString.toUpperCase())) return e
+          if (e.value.toUpperCase().includes(queryString.toUpperCase())) return e
         })
-      }      
+      }
       // 调用 callback 返回建议列表的数据
       cb(restaurants);
     },
@@ -402,14 +452,14 @@ export default {
   //监听事件
   watch: {
     //人员ID未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_check_asbitem.M": {
+    "refParams.brushTimes": {
       // immediate:true,
       handler(newVal, oldVal) {
-        console.log(
-          `watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`
-        );
-        // if (newVal != oldVal)
-        this.getLists();
+        console.log(`watch 电话随访 newVal:${newVal} oldVal:${oldVal} refParams: `,this.refParams);
+        if (newVal != oldVal){
+          this.getLists();
+        }
+        
       },
     },
   },
diff --git a/src/components/follow/SmsSend.vue b/src/components/follow/SmsSend.vue
index 7f74a4a..9c2b899 100644
--- a/src/components/follow/SmsSend.vue
+++ b/src/components/follow/SmsSend.vue
@@ -1,74 +1,30 @@
 <template>
   <div style="display: flex">
     <div :style="`width: ${window.pageWidth - 120}px;`">
-      <el-table
-        :data="phoneFollowUp"
-        border
-        :height="
-          window.pageHeight < 600
-            ? 150
-            : Math.floor((window.pageHeight+20) / 3)
-        "
-        size="small"
-        highlight-current-row
-        ref="phoneFollowUp"
-        @row-click="rowick"
-      >
+      <el-table :data="phoneFollowUp" border :height="window.pageHeight < 600
+        ? 150
+        : Math.floor((window.pageHeight + 20) / 3)
+        " size="small" highlight-current-row ref="phoneFollowUp" @row-click="rowick">
         <el-table-column type="index" label="序号" width="50" align="center" />
         <el-table-column prop="patientName" label="姓名" min-width="80" />
-        <el-table-column
-          prop="mobileTelephone"
-          label="手机号"
-          min-width="130"
-          align="center"
-        />
+        <el-table-column prop="mobileTelephone" label="手机号" min-width="130" align="center" />
         <!-- <el-table-column prop="SmsTypeName" label="短信类别" min-width="80" align="center">
         </el-table-column> -->
         <el-table-column prop="content" label="短信内容" min-width="300" />
-        <el-table-column
-          prop="isComplete"
-          label="完成"
-          min-width="40"
-          align="center"
-        >
+        <el-table-column prop="isComplete" label="完成" min-width="40" align="center">
           <template slot-scope="scope">
-            <el-checkbox
-              v-model="scope.row.isComplete"
-              true-label="Y"
-              false-label="N"
-              disabled
-            />
+            <el-checkbox v-model="scope.row.isComplete" true-label="Y" false-label="N" disabled />
           </template>
         </el-table-column>
         <el-table-column prop="planSendDate" label="推送时间" min-width="300" />
-        <el-table-column
-          prop="lastModifierName"
-          label="修改人"
-          min-width="80"
-          align="center"
-        />
-        <el-table-column
-          prop="lastModificationTime"
-          label="修改日期"
-          min-width="100"
-          align="center"
-        >
+        <el-table-column prop="lastModifierName" label="修改人" min-width="80" align="center" />
+        <el-table-column prop="lastModificationTime" label="修改日期" min-width="100" align="center">
           <template slot-scope="scope">
             <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="creatorName"
-          label="登记人"
-          min-width="80"
-          align="center"
-        />
-        <el-table-column
-          prop="creationTime"
-          label="登记日期"
-          min-width="100"
-          align="center"
-        >
+        <el-table-column prop="creatorName" label="登记人" min-width="80" align="center" />
+        <el-table-column prop="creationTime" label="登记日期" min-width="100" align="center">
           <template slot-scope="scope">
             <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
           </template>
@@ -77,52 +33,57 @@
     </div>
     <div style="width: 120px; margin-top: 50px">
       <div style="margin-left: 10px">
-        <el-button class="commonbutton" type="primary" @click="btnAdd"
-          >新增随访</el-button
-        >
+        <el-button class="commonbutton" type="primary" @click="btnAdd">新增随访</el-button>
       </div>
       <!-- <div style="margin: 10px;">
         <el-button class="commonbutton" type="primary" @click="btnEdit">编辑随访</el-button>
       </div> -->
       <div style="margin: 10px">
-        <el-button class="commonbutton" type="primary" @click="btnDel"
-          >删除随访</el-button
-        >
+        <el-button class="commonbutton" type="primary" @click="btnDel">删除随访</el-button>
       </div>
     </div>
-    <el-dialog
-      :title="title == 1 ? '新增' : '修改'"
-      :visible.sync="dialogVisible"
-      width="75%"
-      :close-on-click-modal="false"
-    >
+    <el-dialog :title="title == 1 ? '新增' : '修改'" :visible.sync="dialogVisible" width="75%"
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="编号">
               <el-input v-model="form.id" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="8">
+            <el-form-item label="随访来源" prop="followUpSourceId">
+              <el-select v-model="form.followUpSourceId" placeholder="随访来源" size="small">
+                <el-option v-for="item in dict.followUpSources" :key="item.id" :label="item.displayName"
+                  :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="随访类型" prop="followUpTypeId">
+              <el-select v-model="form.followUpTypeId" placeholder="随访来源" size="small">
+                <el-option v-for="item in dict.followUpTypes" :key="item.id" :label="item.displayName"
+                  :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="间隔天数">
               <el-input v-model="form.intervalDays" size="small"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="8">
             <el-form-item label="生成次数">
               <el-input v-model="form.generateCount" size="small"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="8">
             <el-form-item label="开始时间">
-              <el-date-picker
-                placeholder="选择日期时间"
-                size="small"
-                v-model="form.startDate"
-                value-format="yyyy-MM-dd"
-                editable
-                style="width: 177px"
-              >
+              <el-date-picker placeholder="选择日期时间" size="small" v-model="form.startDate" value-format="yyyy-MM-dd"
+                editable style="width: 177px">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -142,50 +103,30 @@
           <el-divider></el-divider>
           <el-col :span="4" style="margin-left: 15px">
             <el-form-item label="创建者">
-              <el-input
-                v-model="form.creatorName"
-                disabled
-                size="small"
-              ></el-input>
+              <el-input v-model="form.creatorName" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <el-input
-                :value="form.creationTime | dateFormat"
-                disabled
-                size="small"
-              ></el-input>
+              <el-input :value="form.creationTime | dateFormat" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="修改者">
-              <el-input
-                v-model="form.lastModifierName"
-                disabled
-                size="small"
-              ></el-input>
+              <el-input v-model="form.lastModifierName" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="修改时间">
-              <el-input
-                style="width: 85%"
-                :value="form.lastModificationTime | dateFormat"
-                disabled
-                size="small"
-              ></el-input>
+              <el-input style="width: 85%" :value="form.lastModificationTime | dateFormat" disabled
+                size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" class="difference"
-          >取 消</el-button
-        >
-        <el-button type="primary" @click="addoredit" class="commonbutton"
-          >确 定</el-button
-        >
+        <el-button @click="dialogVisible = false" class="difference">取 消</el-button>
+        <el-button type="primary" @click="addoredit" class="commonbutton">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -198,22 +139,33 @@ import { getapi, postapi, putapi, deletapi } from "../../api/api";
 
 export default {
   components: {},
+  props: ['refParams'],
   data() {
     return {
       phoneFollowUp: [], // 电话随访
       curRow: {},
       dialogVisible: false,
       form: {
-        startDate:"",
-        intervalDays:"",
-        generateCount:"",
-        content:""
+        startDate: "",
+        intervalDays: "",
+        generateCount: "",
+        content: "",
+        followUpSourceId: "03",  // 01-医生站，02-总检医生站,03-客服，99-其它
+        followUpTypeId: "01" // 01-普通，02-复查，03-危急值，99-其它,01-30为系统保留，31以后给客户自定义用
       },
       title: "",
+      rules: {
+        followUpSourceId: [
+          { required: true, message: "请填写随访来源", trigger: "blur" },
+        ],
+        followUpTypeId: [
+          { required: true, message: "请填写随访类型", trigger: "blur" },
+        ]
+      },
     };
   },
 
-  created() {},
+  created() { },
 
   updated() {
     this.$nextTick(() => {
@@ -227,7 +179,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
+    ...mapState(["window", "dict"]),
   },
   methods: {
     dddw,
@@ -239,16 +191,26 @@ export default {
       postapi("/api/app/Asbitem/GetSimpleAsbitemWithDetails").then((res) => {
         if (res.code > -1) this.asbItems = res.data;
       });
+
+      // 获取随访来源
+      postapi("/api/app/FollowUpSource/GetList").then((res) => {
+        if (res.code > -1) this.dict.followUpSources = res.data;
+      });
+
+      // 获取随访类型
+      postapi("/api/app/FollowUpType/GetList").then((res) => {
+        if (res.code > -1) this.dict.followUpTypes = res.data;
+      });
     },
     getLists() {
-      if(this.dataTransOpts.tableS.patient_register.followUpId){
-              postapi("/api/app/SmsSend/GetList", {
-        followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
-      }).then((res) => {
-        if (res.code > -1) this.phoneFollowUp = res.data;
-      });
-      }else{
-        this.phoneFollowUp=[]
+      if (this.refParams.followUpId) {
+        postapi("/api/app/SmsSend/GetList", {
+          followUpId: this.refParams.followUpId,
+        }).then((res) => {
+          if (res.code > -1) this.phoneFollowUp = res.data;
+        });
+      } else {
+        this.phoneFollowUp = []
       }
     },
     rowick(row) {
@@ -266,11 +228,13 @@ export default {
           this.$message.warning("请输入短信内容");
         } else {
           postapi("/api/app/SmsSend/AutoCreate", {
-            followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+            followUpId: this.refParams.followUpId,
             intervalDays: this.form.intervalDays,
             startDate: this.form.startDate,
             generateCount: this.form.generateCount,
             content: this.form.content,
+            followUpSourceId: this.form.followUpSourceId,
+            followUpTypeId: this.form.followUpTypeId
           }).then((res) => {
             if (res.code > -1) {
               this.getLists();
@@ -304,7 +268,7 @@ export default {
     },
 
     // 编辑
-    btnEdit() {},
+    btnEdit() { },
 
     // 删除
     btnDel() {
@@ -329,7 +293,7 @@ export default {
               }
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       }
     },
   },
@@ -337,14 +301,15 @@ export default {
   //监听事件
   watch: {
     //人员ID未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_check_asbitem.M": {
+    "refParams.brushTimes": {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(
-          `watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`
+          `watch 短信随访 newVal:${newVal} oldVal:${oldVal} followUpId: ${this.refParams.followUpId}`
         );
-        // if (newVal != oldVal)
-        this.getLists();
+        if (newVal != oldVal) {
+          this.getLists();
+        }
       },
     },
   },
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index f95fef4..2f9fc37 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -357,7 +357,7 @@
                 <CheckDetails :patientRegisterId="patient_register.id" :tabChoosed="tabChoosed"
                   :refParams="{ place: 'summary', brushTimes: refParamsQuery.brushTimes, patientRegisterId: patient_register.id }" />
               </el-tab-pane>
-              <el-tab-pane label="危急值和随访值" name="3">
+              <el-tab-pane label="危急值" name="3">
                 <AsbitemCriticalValue :tabChoosed="tabChoosed"
                   :refParams="{ place: 'summary', brushTimes: refParamsQuery.brushTimes, patientRegisterId: patient_register.id }" />
               </el-tab-pane>
@@ -378,6 +378,10 @@
                 <SumHistory :patientId="patient_register.patientId" :tabChoosed="tabChoosed"
                   :refParams="{ place: 'summary', brushTimes: refParamsQuery.brushTimes, patientRegisterId: patient_register.id }" />
               </el-tab-pane>
+              <el-tab-pane label="复查/随访" name="7">
+                <PhoneFollowUp
+                  :refParams="{ followUpId: '', patientRegisterId: patient_register.id, criticalValueContents: '', brushTimes: refParamsQuery.brushTimes }" />
+              </el-tab-pane>
               <!--
               <el-tab-pane label="职业病" name="7">
                 <OccDiseaseConclusion :tabChoosed="tabChoosed" />
@@ -564,6 +568,7 @@ import ImageTextReport from "../../components/occDisease/ImageTextReport.vue";
 import AsbitemCriticalValue from "../../components/sumDoctorCheck/AsbitemCriticalValue.vue";
 import OccDisease from "../../components/occDisease/OccDisease.vue"
 import PatientRegisterList from "../../components/doctorCheck/PatientRegisterList.vue";
+import PhoneFollowUp from "../../components/follow/PhoneFollowUp.vue";
 export default {
   components: {
     PatientRegisterBase2,
@@ -576,7 +581,8 @@ export default {
     ImageTextReport,
     AsbitemCriticalValue,
     OccDisease,
-    PatientRegisterList
+    PatientRegisterList,
+    PhoneFollowUp
   },
   data() {
     return {
@@ -610,7 +616,7 @@ export default {
         completeFlag: '2',  //总检状态
         historySummary: '', // 历史综述
       },
-      patient_registerInit:{},  // 重置用到
+      patient_registerInit: {},  // 重置用到
 
       // 综述建议部份
       summaryList: [],
@@ -683,19 +689,19 @@ export default {
         html: ""
       },
 
-      LocalConfig: {        
+      LocalConfig: {
         normal: { // 常规参数          
-          displayTab:false// 是否显示标签页
+          displayTab: false// 是否显示标签页
         }
       },
     };
   },
 
-  created() {  
-    this.patient_registerInit = Object.assign({},this.patient_register)
+  created() {
+    this.patient_registerInit = Object.assign({}, this.patient_register)
 
     if (this.$route.query.patient_register) {
-      this.patient_register = Object.assign({},this.$route.query.patient_register)
+      this.patient_register = Object.assign({}, this.$route.query.patient_register)
     } else {
       this.patient_register = { id: '', patientRegisterNo: '' }
     }
@@ -791,9 +797,9 @@ export default {
       return ret
     },
 
-    dialogMarginTop(){
+    dialogMarginTop() {
       let h = 50
-      if(this.LocalConfig.normal.displayTab) h=85
+      if (this.LocalConfig.normal.displayTab) h = 85
       return h
     },
 
@@ -824,7 +830,7 @@ export default {
     },
 
     // 有人员信息，即可显示的信息
-    manBtnDisabled(){
+    manBtnDisabled() {
       let ret = true
 
       //' 请选择体检人员'
@@ -836,7 +842,7 @@ export default {
 
       return ret
     },
-    
+
     // 有人员，未总检
     sumBtnDisabled() {
       let ret = true
@@ -1072,7 +1078,7 @@ export default {
       this.refParamsQuery = Object.assign({}, this.refParamsQuery, rd,
         {
           brushSummary: Number(this.refParamsQuery.brushSummary) + 1,  //触发综述建议刷新
-          brushTimes:Number(this.refParamsQuery.brushTimes) + 1,  // 其他相关刷新
+          brushTimes: Number(this.refParamsQuery.brushTimes) + 1,  // 其他相关刷新
         }
       )
       // console.log('this.summary_check_default_summay_modifiable', this.summary_check_default_summay_modifiable)
@@ -1090,7 +1096,7 @@ export default {
           this.refParamsQuery = Object.assign({}, this.refParamsQuery, this.patient_register,
             {
               brushSummary: Number(this.refParamsQuery.brushSummary) + 1, //触发综述建议刷新
-              brushTimes:Number(this.refParamsQuery.brushTimes) + 1,  // 其他相关刷新
+              brushTimes: Number(this.refParamsQuery.brushTimes) + 1,  // 其他相关刷新
               brushQueryDisp: Number(this.refParamsQuery.brushQueryDisp) + 1 // 触发人员信息刷新
             }
           )
@@ -1346,7 +1352,7 @@ export default {
 
     // AI诊断 AI重新诊断（使用 fetchStream 实现流式实时渲染）
     btnAIdiagnosis() {
-      this.AI.isAssistant = true      
+      this.AI.isAssistant = true
       let message = this.AI.question;
       if (!message) {
         let linkStr = '；';
@@ -1532,8 +1538,8 @@ export default {
     //重置
     btnReset() {
       // location.reload()      
-      this.patient_register = Object.assign({},this.patient_registerInit)
-      this.refParamsQuery.id = ''        
+      this.patient_register = Object.assign({}, this.patient_registerInit)
+      this.refParamsQuery.id = ''
 
       // 查询条件清空
       this.refParamsQuery.resetTimes++
@@ -1817,7 +1823,7 @@ export default {
     getHaveSumData(patientRegisterId) {
       this.summaryList = [];
       this.suggestionList = [];
-      
+
       if (!patientRegisterId) return
 
       // console.log('getHaveSumData', this.patient_register.completeFlag)
@@ -2748,9 +2754,9 @@ export default {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(`watch.refParams.resetTimes newVal: ${newVal} oldVal: ${oldVal}`);
-        if(newVal && newVal != oldVal){
-          this.prBase = Object.assign({},this.prBase,this.prBaseInit)
-        }        
+        if (newVal && newVal != oldVal) {
+          this.prBase = Object.assign({}, this.prBase, this.prBaseInit)
+        }
       }
     },
 
@@ -2761,9 +2767,9 @@ export default {
         console.log(`watch 总检--tabs newVal: ${newVal}, oldVal: ${oldVal} `);
         if (newVal != oldVal && newVal != '1') {
           switch (newVal) {
-            case '7':
-              this.dataTransOpts.plus.OccDisease++
-              break;
+            // case '7':
+            //   this.dataTransOpts.plus.OccDisease++
+            //   break;
             default:
               this.refParamsQuery.brushTimes++
               break;