diff --git a/src/components/follow/FollowList.vue b/src/components/follow/FollowList.vue
index 3e993f2..18c3e60 100644
--- a/src/components/follow/FollowList.vue
+++ b/src/components/follow/FollowList.vue
@@ -11,7 +11,7 @@
             :row-class-name="handleRowClassName" id="phoneFollowUp">
             <el-table-column prop="patientName" label="姓名" width="90" align="center" />
             <el-table-column prop="idNo" label="身份证" width="150" align="center" />
-            <el-table-column prop="patientRegisterNo" label="人员条码号" width="90" align="center" />
+            <el-table-column prop="patientRegisterNo" label="人员条码" width="110" align="center" />
             <el-table-column prop="medicalTimes" label="体检次数" width="90" align="center" />
             <el-table-column prop="sexName" label="性别" width="50" align="center" />
             <el-table-column prop="birthDate" label="出生日期" width="90" align="center" />
diff --git a/src/components/follow/PhoneFollowList.vue b/src/components/follow/PhoneFollowList.vue
new file mode 100644
index 0000000..a755205
--- /dev/null
+++ b/src/components/follow/PhoneFollowList.vue
@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <div class="middlebox">
+      <div class="contenttitle">
+        体检查询 /
+        <span class="contenttitleBold">电话随访记录</span>
+      </div>
+    </div>
+    <div
+      style="display: flex;justify-content: space-between; padding: 10px;background-color: #fff;border-radius: 8px;margin-bottom: 10px;">
+      <div style="display:block;">
+        <div style="display: flex;flex-wrap: wrap;height: 32px;align-items: center;">
+          <div class="query">
+            <el-select v-model="query.dateType" placeholder="请选择" style="width: 80px" size="small">
+              <el-option label="随访日期" :value="'1'" />
+            </el-select>            
+            <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+            <span class="spanClass">至</span>
+            <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+          </div>          
+          <div class="query">
+            <span class="spanClass">完成状态</span>
+            <el-select v-model="query.isComplete" placeholder="完成状态" style="width: 80px" size="small" clearable>
+              <el-option label="已完成" value="Y" />
+              <el-option label="未完成" value="N" />
+            </el-select>  
+          </div>
+          <div class="query">
+            <span class="spanClass">条码号</span>
+            <el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small" clearable style="width: 140px"/>
+          </div>
+          <div class="query">
+            <span class="spanClass">档案号</span>
+            <el-input placeholder="档案号" v-model="query.patientNo" size="small" clearable style="width: 140px"/>
+          </div>
+        </div>
+        <div style="display: flex;flex-wrap: wrap;margin-top: 2px; height: 32px;align-items: center;">
+          <div class="query">
+            <span class="spanClass">身份证号</span>
+            <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 160px"/>
+          </div>
+          <div class="query">
+            <span class="spanClass">姓名</span>
+            <el-input placeholder="姓名" v-model="query.patientName" size="small" clearable style="width: 80px"/>
+          </div>
+          <div class="query">
+            <span class="spanClass">其他关键字</span>
+            <el-input placeholder="其他关键字" v-model="query.keyWord" size="small" clearable style="width: 280px"/>
+          </div>
+        </div>
+      </div>
+      <div style="display: block;width: 110px;">
+        <div>
+          <el-button type="primary" class="commonbutton" @click="btnQuery" size="small">查询</el-button>
+        </div>
+        <div  style="margin-top: 5px;">
+          <el-button class="commonbutton" @click="btnExport('tableData')" size="small">导出</el-button>
+        </div>
+      </div>
+    </div>
+    <div id="tableData">
+      <el-table :data="tableData" border :height="window.pageHeight - 192" highlight-current-row size="small"
+        row-key="id" show-summary ref="refTable"> <!-- :summary-method="getSummaries" -->
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="followUpTypeName" label="随访类型" min-width="80" align="center" filterable/>
+        <el-table-column prop="followUpSourceName" label="随访来源" min-width="80" align="center" filterable/>
+        <el-table-column prop="followUpContent" label="随访内容" min-width="250" filterable/>
+        <el-table-column prop="replyContent" label="回复内容" min-width="200" align="center" filterable/>
+        <el-table-column prop="isComplete" label="完成" min-width="60" align="center">
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.isComplete" true-label="Y" false-label="N" disabled />
+          </template>
+        </el-table-column>
+        <el-table-column prop="planFollowDate" label="随访日期" min-width="100" align="center" filterable>
+          <template slot-scope="scope">
+            <div>
+              {{ moment(scope.row.planFollowDate).format("yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <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">
+          <template slot-scope="scope">
+            <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { deepCopy } from "../../utlis/proFunc"
+
+import moment from "moment";
+import FileSaver from 'file-saver';
+
+export default {
+  components: {
+    
+  },
+  props: ["orgEnable"],
+  data() {
+    return {      
+      query: {
+        dateType: '1',
+        startDate: '',
+        endDate: '',
+        patientName: '',
+        idNo: '',
+        patientRegisterNo: '',
+        patientNo: '',
+        keyWord:'',
+        isComplete: 'Y',
+      },
+      tableData: [],
+
+    };
+  },
+
+  created() {
+
+  },
+
+  //挂载完成
+  mounted() {
+
+    this.dictInit()
+
+  },
+
+  updated() {
+    // this.$nextTick(() => {
+    //   this.$refs['refTable'].doLayout()
+    // })
+  },
+
+  computed: {
+    ...mapState(["pickerOptions","window", "dict"]),
+  },
+  methods: {
+    //获取初始数据
+    dictInit() {
+      let today = moment(new Date()).format("YYYY-MM-DD")
+      this.query.startDate = today
+      this.query.endDate = today
+
+      // //获取单位列表
+      // getapi("/api/app/customer-org/parent-all").then((res) => {
+      //   if (res.code != -1) {
+      //     this.customerOrgAll = res.data;
+      //     this.customerOrg = deepCopy(this.customerOrgAll).slice(0,100);
+      //   }
+      // });
+
+      // // 体检类别
+      // getapi("/api/app/medical-type/in-filter").then((res) => {
+      //   if (res.code > -1) {
+      //     this.dict.medicalType = res.data;
+      //     this.medicalType = res.data
+      //   }
+      // });
+
+      // //人员类别
+      // getapi("/api/app/personnel-type/in-filter").then((res) => {
+      //   if (res.code == 1) {
+      //     this.dict.personnelType = res.data;
+      //     this.personnelType = res.data;
+      //   }
+      // });
+
+      // // 业务员 {
+      // postapi('/api/identity/users/GetUserListBySaleRole')
+      //   .then(res => {
+      //     if (res.code > -1) {
+      //       this.dictSalesman = res.data
+      //     }
+      //   })
+
+    },
+
+    //通用导出
+    btnExport(elId) {
+      let table = document.getElementById(elId);
+      let tableData = table.innerHTML
+      let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" });
+      FileSaver.saveAs(blob, fileName);
+    },
+
+    // // 单位过滤
+    // filterMethod(keyWords) {
+    //   if (keyWords) {
+    //     this.customerOrg = [];
+    //     let customerOrgFilter = []
+    //     this.customerOrgAll.forEach((item) => {
+    //       if (
+    //         item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
+    //         item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+    //         // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+    //       ) {
+    //         customerOrgFilter.push(item);
+    //       }
+    //     });
+    //     this.customerOrg = customerOrgFilter.slice(0,100)
+    //   } else {
+    //     this.customerOrg = deepCopy(this.customerOrgAll).slice(0,100);
+    //   }
+    // },
+
+    // 查询
+    btnQuery() {
+      //let body = deepCopy(this.query)
+      this.tableData = []
+      let body = Object.assign({},this.query)
+      Object.keys(this.query).forEach(key => {
+        console.log(key,this.query[key])
+        if(!this.query[key]) delete body[key]
+      });      
+      postapi("/api/app/PhoneFollowUp/GetList", body).then(res => {
+        if (res.code > -1) {
+          this.tableData = res.data          
+        }
+      })
+    },
+
+    //合计
+    getSummaries(param) {
+      console.log('getSummaries param', param)
+      // if(!param){
+      //   param = {
+      //     columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}],
+      //     data:this.customerOrgGroupAsbitems
+      //   }
+      // }
+
+      const { columns, data } = param;
+      const sumCol = [2, 3, 4, 7, 8, 9]  //需合计的列
+      const sums = [];
+      columns.forEach((column, index) => {
+        //console.log('column, index,data',column, index,data)
+        //显示合计列
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = '';
+          return;
+        }
+
+        sums[index] = 0
+        data.forEach(e => {
+          if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount']
+        })
+        sums[index] = sums[index].toFixed(2) //+ ' 元';
+
+      });
+      // this.groupPrice = sums[7];
+      // console.log('getSummaries',sums)
+      // if (!this.totalFoucs) this.total = sums[5];
+      // if (!this.discountFoucs) this.discount = Number(this.total * 100 / this.totalStand).toFixed(2);
+      return sums;
+    },
+
+  },
+};
+</script>
+<style scoped>
+@import '../../assets/css/global.css';
+@import '../../assets/css/global_font.css';
+
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 5px;
+  padding-right: 15px;
+}
+
+::v-deep .el-input__icon {
+  width: 15px;
+  /* 输入框下拉箭头或清除图标 默认 25 */
+}
+
+::v-deep .el-input-group__append {
+  padding: 0 5px;
+  /* 控件默认 0 20px;*/
+}
+
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
+
+.query {
+  margin-left: 10px;
+  font-size: 14px;
+  color: #232748;
+  font-weight: 400;
+  font-family: "NotoSansSC-Regular";
+}
+
+.spanClass {
+  padding: 0 2px 0 0;
+}
+</style>
diff --git a/src/components/follow/PhoneFollowUp.vue b/src/components/follow/PhoneFollowUp.vue
index 2641d38..b409510 100644
--- a/src/components/follow/PhoneFollowUp.vue
+++ b/src/components/follow/PhoneFollowUp.vue
@@ -1,11 +1,11 @@
 <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">
+    <div :style="`width: ${tableWidth}px;`">
+      <el-table :data="phoneFollowUp" border :height="tableHeight" size="small" highlight-current-row
+        ref="phoneFollowUp" @row-click="rowick">
         <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="followUpTypeName" label="随访类型" min-width="80" align="center" />
+        <el-table-column prop="followUpSourceName" label="随访来源" min-width="80" align="center" />
         <el-table-column prop="followUpContent" label="随访内容" min-width="250" />
         <el-table-column prop="replyContent" label="回复内容" min-width="200" align="center" />
         <el-table-column prop="isComplete" label="完成" min-width="40" align="center">
@@ -181,7 +181,7 @@ import { getapi, postapi, putapi, deletapi } from "../../api/api";
 
 export default {
   components: {},
-  props: ['refParams'],
+  props: ['refParams', 'tabChoosed'],
   data() {
     return {
       phoneFollowUp: [], // 电话随访
@@ -198,7 +198,7 @@ export default {
         generateCount: "",
         replyContent: "",
         followUpSourceId: "03",  // 01-医生站，02-总检医生站,03-客服，99-其它
-        followUpTypeId: "01" // 01-普通，02-复查，03-危急值，99-其它,01-30为系统保留，31以后给客户自定义用
+        followUpTypeId: "" // 01-普通，02-复查，03-危急值，99-其它,01-30为系统保留，31以后给客户自定义用
       },
 
       rules: {
@@ -243,7 +243,27 @@ export default {
   },
 
   computed: {
-    ...mapState(["window",  "dict" ]),
+    ...mapState(["window", "dict"]),
+
+    // 列表宽度
+    tableWidth() {
+      let w = this.window.pageWidth - 120
+      if (this.refParams.place == 'summary') {
+        w = w - 120
+      }
+      return w
+    },
+
+    tableHeight() {
+      let h = this.window.pageHeight < 600
+        ? 150
+        : Math.floor((this.window.pageHeight + 20) / 3)
+      if (this.refParams.place == 'summary') {
+        h = this.window.pageHeight - 200
+      }
+      return h
+    },
+
   },
   methods: {
     dddw,
@@ -268,17 +288,24 @@ export default {
 
 
     },
+
     getLists() {
+      let body = {}
       if (this.refParams.followUpId) {
-        postapi("/api/app/PhoneFollowUp/GetList", {
-          followUpId: this.refParams.followUpId,
-        }).then((res) => {
-          if (res.code > -1) this.phoneFollowUp = res.data;
-        });
+        body = { followUpId: this.refParams.followUpId }
+      } else if (this.refParams.patientRegisterId) {
+        body = { patientRegisterId: this.refParams.patientRegisterId }
       } else {
         this.phoneFollowUp = []
+        return
       }
+
+      postapi("/api/app/PhoneFollowUp/GetList", body)
+        .then((res) => {
+          if (res.code > -1) this.phoneFollowUp = res.data;
+        });
     },
+
     addoredit() {
       this.$refs['form'].validate((valid, fields) => {
         // console.log('fields', fields)
@@ -286,6 +313,26 @@ export default {
           this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message });
           return false
         }
+
+        let body = {
+          intervalDays: this.form.intervalDays,
+          startDate: this.form.startDate,
+          followUpContent: this.form.followUpContent,
+          generateCount: this.form.generateCount,
+          followUpTypeId: this.form.followUpTypeId,
+          followUpSourceId: this.form.followUpSourceId,
+
+          planFollowDate: this.form.planFollowDate,
+          replyContent: this.form.replyContent,
+
+        }
+
+        if (this.refParams.followUpId) {
+          body.followUpId = this.refParams.followUpId
+        } else {
+          body.patientRegisterId = this.refParams.patientRegisterId
+        }
+        
         if (this.title == 1) {
           if (this.mode == 1) {
             if (this.form.intervalDays == "") {
@@ -295,64 +342,50 @@ export default {
             } 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";
-                }
-              });
+              postapi("/api/app/PhoneFollowUp/AutoCreate", body)
+                .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) => {
+              postapi("/api/app/PhoneFollowUp/Create", body)
+                .then((res) => {
+                  if (res.code > -1) {
+                    this.getLists();
+                    this.dialogVisible = false;
+                    this.mode = "0";
+                  }
+                });
+            }
+          } else {
+            postapi("/api/app/PhoneFollowUp/CreateThreeMonthPlan", body)
+              .then((res) => {
                 if (res.code > -1) {
                   this.getLists();
                   this.dialogVisible = false;
                   this.mode = "0";
                 }
               });
-            }
-          } else {
-            postapi("/api/app/PhoneFollowUp/CreateThreeMonthPlan", {
-              followUpId: this.refParams.followUpId,
-              followUpContent: this.form.followUpContent,
-              replyContent: this.form.replyContent,
-            }).then((res) => {
+          }
+        } else {
+          postapi("/api/app/PhoneFollowUp/Update", Object.assign({}, body, {
+            phoneFollowUpId: this.form.id,
+            isComplete: this.form.isComplete,
+          }))
+            .then((res) => {
               if (res.code > -1) {
                 this.getLists();
                 this.dialogVisible = false;
                 this.mode = "0";
               }
             });
-          }
-        } 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";
-            }
-          });
         }
       })
     },
@@ -455,11 +488,14 @@ export default {
     "refParams.brushTimes": {
       // immediate:true,
       handler(newVal, oldVal) {
-        console.log(`watch 电话随访 newVal:${newVal} oldVal:${oldVal} refParams: `,this.refParams);
-        if (newVal != oldVal){
-          this.getLists();
+        console.log(`watch 电话随访 newVal:${newVal} oldVal:${oldVal} refParams: `, this.refParams);
+        if (newVal != oldVal) {
+          if (this.refParams.place == 'summary') {
+            if (this.tabChoosed == '7') this.getLists();
+          } else {
+            this.getLists();
+          }
         }
-        
       },
     },
   },
diff --git a/src/components/follow/SmsSend.vue b/src/components/follow/SmsSend.vue
index 9c2b899..9e3d29e 100644
--- a/src/components/follow/SmsSend.vue
+++ b/src/components/follow/SmsSend.vue
@@ -10,6 +10,8 @@
         <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="followUpTypeName" label="随访类型" min-width="80" align="center" />
+        <el-table-column prop="followUpSourceName" label="随访来源" min-width="80" align="center" />
         <el-table-column prop="content" label="短信内容" min-width="300" />
         <el-table-column prop="isComplete" label="完成" min-width="40" align="center">
           <template slot-scope="scope">
@@ -44,7 +46,7 @@
     </div>
     <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-form ref="form" :model="form" label-width="80px" :rules="rules">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编号">
@@ -151,7 +153,7 @@ export default {
         generateCount: "",
         content: "",
         followUpSourceId: "03",  // 01-医生站，02-总检医生站,03-客服，99-其它
-        followUpTypeId: "01" // 01-普通，02-复查，03-危急值，99-其它,01-30为系统保留，31以后给客户自定义用
+        followUpTypeId: "" // 01-普通，02-复查，03-危急值，99-其它,01-30为系统保留，31以后给客户自定义用
       },
       title: "",
       rules: {
@@ -202,47 +204,60 @@ export default {
         if (res.code > -1) this.dict.followUpTypes = res.data;
       });
     },
+
     getLists() {
+      let body = {}
       if (this.refParams.followUpId) {
-        postapi("/api/app/SmsSend/GetList", {
-          followUpId: this.refParams.followUpId,
-        }).then((res) => {
-          if (res.code > -1) this.phoneFollowUp = res.data;
-        });
+        body = { followUpId: this.refParams.followUpId }
+      } else if (this.refParams.patientRegisterId) {
+        body = { patientRegisterId: this.refParams.patientRegisterId }
       } else {
         this.phoneFollowUp = []
+        return
       }
+      postapi("/api/app/SmsSend/GetList", body)
+        .then((res) => {
+          if (res.code > -1) this.phoneFollowUp = res.data;
+        });
     },
+
     rowick(row) {
       this.curRow = { ...row };
     },
     addoredit() {
-      if (this.title == 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 if (this.form.content == "") {
-          this.$message.warning("请输入短信内容");
-        } else {
-          postapi("/api/app/SmsSend/AutoCreate", {
-            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();
-              this.dialogVisible = false;
-            }
-          });
+      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.form.intervalDays == "") {
+            this.$message.warning("请输入间隔天数");
+          } else if (this.form.startDate == "") {
+            this.$message.warning("请选择开始时间");
+          } else if (this.form.generateCount == "") {
+            this.$message.warning("请输入生成天数");
+          } else if (this.form.content == "") {
+            this.$message.warning("请输入短信内容");
+          } else {
+            postapi("/api/app/SmsSend/AutoCreate", {
+              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();
+                this.dialogVisible = false;
+              }
+            });
+          }
+        }
+      })
     },
     // 设置颜色
     setColor(checkCompleteFlag) {
diff --git a/src/components/follow/SmsSendList.vue b/src/components/follow/SmsSendList.vue
new file mode 100644
index 0000000..ef5c1e1
--- /dev/null
+++ b/src/components/follow/SmsSendList.vue
@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <div class="middlebox">
+      <div class="contenttitle">
+        体检查询 /
+        <span class="contenttitleBold">短信随访记录</span>
+      </div>
+    </div>
+    <div
+      style="display: flex;justify-content: space-between; padding: 10px;background-color: #fff;border-radius: 8px;margin-bottom: 10px;">
+      <div style="display:block;">
+        <div style="display: flex;flex-wrap: wrap;height: 32px;align-items: center;">
+          <div class="query">
+            <el-select v-model="query.dateType" placeholder="请选择" style="width: 80px" size="small">
+              <el-option label="随访日期" :value="'1'" />
+            </el-select>            
+            <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+            <span class="spanClass">至</span>
+            <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+          </div>          
+          <div class="query">
+            <span class="spanClass">完成状态</span>
+            <el-select v-model="query.isComplete" placeholder="完成状态" style="width: 80px" size="small" clearable>
+              <el-option label="已完成" value="Y" />
+              <el-option label="未完成" value="N" />
+            </el-select>  
+          </div>
+          <div class="query">
+            <span class="spanClass">条码号</span>
+            <el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small" clearable style="width: 140px"/>
+          </div>
+          <div class="query">
+            <span class="spanClass">档案号</span>
+            <el-input placeholder="档案号" v-model="query.patientNo" size="small" clearable style="width: 140px"/>
+          </div>
+        </div>
+        <div style="display: flex;flex-wrap: wrap;margin-top: 2px; height: 32px;align-items: center;">
+          <div class="query">
+            <span class="spanClass">身份证号</span>
+            <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 160px"/>
+          </div>
+          <div class="query">
+            <span class="spanClass">姓名</span>
+            <el-input placeholder="姓名" v-model="query.patientName" size="small" clearable style="width: 80px"/>
+          </div>
+          <div class="query">
+            <span class="spanClass">其他关键字</span>
+            <el-input placeholder="其他关键字" v-model="query.keyWord" size="small" clearable style="width: 80px"/>
+          </div>
+        </div>
+      </div>
+      <div style="display: block;width: 110px;">
+        <div>
+          <el-button type="primary" class="commonbutton" @click="btnQuery" size="small">查询</el-button>
+        </div>
+        <div  style="margin-top: 5px;">
+          <el-button class="commonbutton" @click="btnExport('tableData')" size="small">导出</el-button>
+        </div>
+      </div>
+    </div>
+    <div id="tableData">
+      <el-table :data="tableData" border :height="window.pageHeight - 192" highlight-current-row size="small"
+        row-key="id" show-summary ref="refTable"> <!-- :summary-method="getSummaries" -->
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="followUpTypeName" label="随访类型" min-width="80" align="center" filterable/>
+        <el-table-column prop="followUpSourceName" label="随访来源" min-width="80" align="center" filterable/>
+        <el-table-column prop="followUpContent" label="随访内容" min-width="250" filterable/>
+        <el-table-column prop="replyContent" label="回复内容" min-width="200" align="center" filterable/>
+        <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 />
+          </template>
+        </el-table-column>
+        <el-table-column prop="planFollowDate" label="随访日期" min-width="100" align="center" filterable>
+          <template slot-scope="scope">
+            <div>
+              {{ moment(scope.row.planFollowDate).format("yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <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">
+          <template slot-scope="scope">
+            <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { deepCopy } from "../../utlis/proFunc"
+
+import moment from "moment";
+import FileSaver from 'file-saver';
+
+export default {
+  components: {
+    
+  },
+  props: ["orgEnable"],
+  data() {
+    return {      
+      query: {
+        dateType: '1',
+        startDate: '',
+        endDate: '',
+        patientName: '',
+        idNo: '',
+        patientRegisterNo: '',
+        patientNo: '',
+        keyWord:'',
+        isComplete: 'Y',
+      },
+      tableData: [],
+
+    };
+  },
+
+  created() {
+
+  },
+
+  //挂载完成
+  mounted() {
+
+    this.dictInit()
+
+  },
+
+  updated() {
+    // this.$nextTick(() => {
+    //   this.$refs['refTable'].doLayout()
+    // })
+  },
+
+  computed: {
+    ...mapState(["pickerOptions","window", "dict"]),
+  },
+  methods: {
+    //获取初始数据
+    dictInit() {
+      let today = moment(new Date()).format("YYYY-MM-DD")
+      this.query.startDate = today
+      this.query.endDate = today
+
+      // //获取单位列表
+      // getapi("/api/app/customer-org/parent-all").then((res) => {
+      //   if (res.code != -1) {
+      //     this.customerOrgAll = res.data;
+      //     this.customerOrg = deepCopy(this.customerOrgAll).slice(0,100);
+      //   }
+      // });
+
+      // // 体检类别
+      // getapi("/api/app/medical-type/in-filter").then((res) => {
+      //   if (res.code > -1) {
+      //     this.dict.medicalType = res.data;
+      //     this.medicalType = res.data
+      //   }
+      // });
+
+      // //人员类别
+      // getapi("/api/app/personnel-type/in-filter").then((res) => {
+      //   if (res.code == 1) {
+      //     this.dict.personnelType = res.data;
+      //     this.personnelType = res.data;
+      //   }
+      // });
+
+      // // 业务员 {
+      // postapi('/api/identity/users/GetUserListBySaleRole')
+      //   .then(res => {
+      //     if (res.code > -1) {
+      //       this.dictSalesman = res.data
+      //     }
+      //   })
+
+    },
+
+    //通用导出
+    btnExport(elId) {
+      let table = document.getElementById(elId);
+      let tableData = table.innerHTML
+      let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" });
+      FileSaver.saveAs(blob, fileName);
+    },
+
+    // // 单位过滤
+    // filterMethod(keyWords) {
+    //   if (keyWords) {
+    //     this.customerOrg = [];
+    //     let customerOrgFilter = []
+    //     this.customerOrgAll.forEach((item) => {
+    //       if (
+    //         item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
+    //         item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+    //         // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+    //       ) {
+    //         customerOrgFilter.push(item);
+    //       }
+    //     });
+    //     this.customerOrg = customerOrgFilter.slice(0,100)
+    //   } else {
+    //     this.customerOrg = deepCopy(this.customerOrgAll).slice(0,100);
+    //   }
+    // },
+
+    // 查询
+    btnQuery() {
+      //let body = deepCopy(this.query)
+      this.tableData = []
+      let body = Object.assign({},this.query)
+      Object.keys(this.query).forEach(key => {
+        console.log(key,this.query[key])
+        if(!this.query[key]) delete body[key]
+      });  
+      postapi("/api/app/SmsSend/GetList", body).then(res => {
+        if (res.code > -1) {
+          this.tableData = res.data          
+        }
+      })
+    },
+
+    //合计
+    getSummaries(param) {
+      console.log('getSummaries param', param)
+      // if(!param){
+      //   param = {
+      //     columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}],
+      //     data:this.customerOrgGroupAsbitems
+      //   }
+      // }
+
+      const { columns, data } = param;
+      const sumCol = [2, 3, 4, 7, 8, 9]  //需合计的列
+      const sums = [];
+      columns.forEach((column, index) => {
+        //console.log('column, index,data',column, index,data)
+        //显示合计列
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = '';
+          return;
+        }
+
+        sums[index] = 0
+        data.forEach(e => {
+          if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount']
+        })
+        sums[index] = sums[index].toFixed(2) //+ ' 元';
+
+      });
+      // this.groupPrice = sums[7];
+      // console.log('getSummaries',sums)
+      // if (!this.totalFoucs) this.total = sums[5];
+      // if (!this.discountFoucs) this.discount = Number(this.total * 100 / this.totalStand).toFixed(2);
+      return sums;
+    },
+
+  },
+};
+</script>
+<style scoped>
+@import '../../assets/css/global.css';
+@import '../../assets/css/global_font.css';
+
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 5px;
+  padding-right: 15px;
+}
+
+::v-deep .el-input__icon {
+  width: 15px;
+  /* 输入框下拉箭头或清除图标 默认 25 */
+}
+
+::v-deep .el-input-group__append {
+  padding: 0 5px;
+  /* 控件默认 0 20px;*/
+}
+
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
+
+.query {
+  margin-left: 10px;
+  font-size: 14px;
+  color: #232748;
+  font-weight: 400;
+  font-family: "NotoSansSC-Regular";
+}
+
+.spanClass {
+  padding: 0 2px 0 0;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 1632080..214c947 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -600,6 +600,18 @@ const routes = [{
                 component: () =>
                     import ("../components/report/TurnoverReportReal.vue"),
             },
+            {
+                path: "/PhoneFollowList",
+                name: "电话随访记录",
+                component: () =>
+                    import ("../components/follow/PhoneFollowList.vue"),
+            },
+            {
+                path: "/SmsSendList",
+                name: "短信随访记录",
+                component: () =>
+                    import ("../components/follow/SmsSendList.vue"),
+            },
             {
                 path: "/AppointQuery",
                 name: "网上预约汇总",
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 2f9fc37..1acc784 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -379,8 +379,8 @@
                   :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 }" />
+                <PhoneFollowUp :tabChoosed="tabChoosed"
+                  :refParams="{ place: 'summary', followUpId: '', patientRegisterId: patient_register.id, criticalValueContents: '', brushTimes: refParamsQuery.brushTimes }" />
               </el-tab-pane>
               <!--
               <el-tab-pane label="职业病" name="7">