diff --git a/src/views/manage/components/TemplateName.vue b/src/views/manage/components/TemplateName.vue
index 75bbe9b..6716e1f 100644
--- a/src/views/manage/components/TemplateName.vue
+++ b/src/views/manage/components/TemplateName.vue
@@ -31,20 +31,22 @@
             v-show="showSearch"
             label-width="100px"
           >
-            <el-form-item
-              label="模板名称"
-              prop="questionnaireName"
-              label-width="120px"
-            >
+            <el-form-item label="问卷标题" prop="questionnaireName">
               <el-input
                 v-model="queryParams.questionnaireName"
-                placeholder="请输入模板名称"
+                placeholder="请输入问卷标题"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="病种名称" prop="diseaseTypeName">
+              <el-input
+                v-model="queryParams.diseaseTypeName"
+                placeholder="请输入病种名称"
                 clearable
                 @keyup.enter.native="handleQuery"
-                style="width: 220px"
               />
             </el-form-item>
-
             <el-form-item>
               <el-button
                 type="primary"
@@ -69,21 +71,56 @@
               width="48"
               align="center"
             />
-
             <el-table-column
-              label="模板名称"
+              label="问卷标题"
               align="center"
               prop="questionnaireName"
-              width="150"
             />
-            <el-table-column label="操作人" align="center" prop="createBy" />
-            <el-table-column label="创建时间" align="center" prop="createTime">
+            <el-table-column
+              label="问题个数"
+              align="center"
+              prop="questionCount"
+            />
+            <el-table-column
+              label="问卷模板ID"
+              align="center"
+              prop="questionnaireId"
+            />
+            <el-table-column
+              label="问卷类型"
+              align="center"
+              prop="questionType"
+            >
               <template slot-scope="scope">
-                <span>{{
-                  parseTime(scope.row.createTime, "{y}-{m}-{d}")
-                }}</span>
+                <div v-if="scope.row.questionType == 'REGULAR_QUESTIONNAIRE'">
+                  普通问卷
+                </div>
+                <div
+                  v-if="scope.row.questionType == 'SATISFACTION_QUESTIONNAIRE'"
+                >
+                  满意度问卷
+                </div>
               </template>
             </el-table-column>
+            <el-table-column
+              label="问卷状态"
+              align="center"
+              prop="questionnaireStatus"
+            >
+              <template slot-scope="scope">
+                <el-tag
+                  type="success"
+                  v-if="scope.row.questionnaireStatus == 'PUBLISHED'"
+                  >已发布</el-tag
+                >
+                <el-tag type="warning" v-else>未发布</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="病种名称"
+              align="center"
+              prop="diseaseTypeName"
+            />
             <el-table-column
               label="操作"
               align="center"
@@ -166,6 +203,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         questionnaireName: null,
+        diseaseTypeName:null,
+        
       },
     };
   },
@@ -175,31 +214,13 @@ export default {
 
   },
   mounted() {
-    console.log(this.query, 'query')
-
-    console.log(this.templateId, 'templateId')
-    if (this.templateId) {
-      this.handleselectId = this.templateId;
-
-
-    } else {
-      this.questionnaireName = '';
-      this.handleselectId = '';
-
-
-    }
-    if (this.query == true) {
-      this.questionnaireName = '';
-      this.handleselectId = '';
-
-
-    }
+    this.handleselectId = this.templateId;
   },
   watch: {
     query: {
       handler(val) {
-        if(val>1){
-            this.questionnaireName = '';
+        if (val > 1) {
+          this.questionnaireName = '';
           this.handleselectId = '';
         }
       },
@@ -210,12 +231,10 @@ export default {
       handler(val) {
         if (val) {
           this.handleselectId = val;
-
         } else {
           this.questionnaireName = '';
           this.handleselectId = '';
         }
-
       },
       deep: true,
       immediate: true,
diff --git a/src/views/system/TaskStatistics/index.vue b/src/views/system/TaskStatistics/index.vue
index c5384ed..8cc07ca 100644
--- a/src/views/system/TaskStatistics/index.vue
+++ b/src/views/system/TaskStatistics/index.vue
@@ -208,7 +208,7 @@ export default {
     }
   },
   created() {
-    // this.getDefaultDateRange()
+    this.getDefaultDateRange()
     // this.getlist()
     this.getlistleft()
   },
@@ -248,12 +248,6 @@ export default {
     messageontemplateword(item) {
       this.queryParams.questionInfoId = item.questionInfoId;
       this.itemid=item.questionInfoId
-      // var obj = {
-      //   questionInfoId: this.itemid
-      // }
-      // questionnaireTaskStatistics(obj).then(res => {
-      //   this.tableData = res.data.data
-      // })
     },
     //计算一周的时间
     getDefaultDateRange() {