diff --git a/src/views/basic-dictionary/MedicalConclusion.vue b/src/views/basic-dictionary/MedicalConclusion.vue
index dddd164..aaf90eb 100644
--- a/src/views/basic-dictionary/MedicalConclusion.vue
+++ b/src/views/basic-dictionary/MedicalConclusion.vue
@@ -4,17 +4,11 @@
       <el-card>
         <el-row style="margin-top: 20px; margin-left: 15px">
           <el-col :span="4">
-            <el-autocomplete
-              class="inline-input"
-              v-model="page.Filter"
-              :fetch-suggestions="querySearch"
-              placeholder="请输入内容"
-              @select="handleSelect"
-            >
+            <el-autocomplete class="inline-input" v-model="page.Filter" :fetch-suggestions="querySearch"
+              placeholder="请输入内容" @select="handleSelect">
               <template slot-scope="{ item }">
-                <div class="name">{{ item.displayName }}</div>
-              </template></el-autocomplete
-            >
+                <div class="name" @click="selsearch(item.id, item.medicalConclusionTypeId)">{{ item.displayName }}</div>
+              </template></el-autocomplete>
             <!-- <el-input
               v-model="page.Filter"
               clearable
@@ -28,34 +22,15 @@
             > -->
           </el-col>
           <el-col :span="7" style="margin-left: 5%">
-            <el-col :span="6" style="margin-top: 10px; margin-left: 10px"
-              >类别选择</el-col
-            >
-            <el-select
-              filterable
-              v-model="Selectvalue"
-              placeholder="请选择"
-              @change="isselctvalue"
-            >
-              <el-option
-                v-for="item in Selectacategory"
-                :key="item.id"
-                :label="item.displayName"
-                :value="item.id"
-              >
+            <el-col :span="6" style="margin-top: 10px; margin-left: 10px">类别选择</el-col>
+            <el-select filterable v-model="Selectvalue" placeholder="请选择" @change="isselctvalue">
+              <el-option v-for="item in Selectacategory" :key="item.id" :label="item.displayName" :value="item.id">
               </el-option>
             </el-select>
           </el-col>
         </el-row>
-        <el-table
-          :data="tableData"
-          style="width: 100%; height: 500px"
-          :row-key="form.id"
-          class="el-table__body-wrapper tbody"
-          @row-click="rowick"
-          highlight-current-row
-          ref="tableData"
-        >
+        <el-table :data="tableData" style="width: 100%; height: 500px" :row-key="form.id"
+          class="el-table__body-wrapper tbody" @row-click="rowclick" highlight-current-row ref="tableData">
           <el-table-column prop="id" label="编号" width="300">
           </el-table-column>
           <el-table-column prop="displayName" label="名称" width="">
@@ -69,26 +44,15 @@
           </el-table-column>
           <el-table-column prop="lastModifierName" label="修改者" width="">
           </el-table-column>
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
-          >
+          <el-table-column prop="lastModificationTime" label="修改时间" width="200">
             <template slot-scope="scope">
               {{ scope.row.lastModificationTime | dateFormat }}
             </template>
           </el-table-column>
           <el-table-column label="操作">
             <template>
-              <el-tag
-                class="move"
-                style="cursor: move; margin-left: 15px"
-                draggable="true"
-              >
-                <i
-                  class="el-icon-d-caret"
-                  style="width: 1rem; height: 1rem"
-                ></i>
+              <el-tag class="move" style="cursor: move; margin-left: 15px" draggable="true">
+                <i class="el-icon-d-caret" style="width: 1rem; height: 1rem"></i>
               </el-tag>
             </template>
           </el-table-column>
@@ -98,12 +62,7 @@
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 9%">
       <el-button type="primary" @click="add">新增</el-button>
-      <el-button
-        type="primary"
-        @click="editpopup"
-        style="margin-left: 0; margin-top: 10px"
-        >编辑</el-button
-      >
+      <el-button type="primary" @click="editpopup" style="margin-left: 0; margin-top: 10px">编辑</el-button>
       <div style="margin-top: 10px">
         <el-button type="danger" @click="delsrts">删除</el-button>
       </div>
@@ -113,52 +72,32 @@
           <el-button type="primary" @click="toppings">置底</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button type="primary" :disabled="isshow" @click="assertion"
-            >排序</el-button
-          >
+          <el-button type="primary" :disabled="isshow" @click="assertion">排序</el-button>
           <div style="margin-top: 5px">
-            <el-button type="primary" :disabled="isshow" @click="cancellation"
-              >取消</el-button
-            >
+            <el-button type="primary" :disabled="isshow" @click="cancellation">取消</el-button>
           </div>
         </div>
       </div>
     </div>
     <!-- 新增或者编辑弹框 -->
-    <el-dialog
-      :title="title == 1 ? '新增' : '编辑'"
-      :visible.sync="dialogVisible"
-      width="75%"
-    >
+    <el-dialog :title="title == 1 ? '新增' : '编辑'" :visible.sync="dialogVisible" width="75%">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="9">
             <el-form-item label="编号">
-              <el-input
-                v-model="form.id"
-                style="width: 90%"
-                disabled
-              ></el-input>
+              <el-input v-model="form.id" style="width: 90%" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="名称">
-              <el-input
-                v-model="form.displayName"
-                style="width: 80%"
-              ></el-input>
+              <el-input v-model="form.displayName" style="width: 80%"></el-input>
             </el-form-item>
           </el-col>
           <!-- @change="change" -->
           <el-col :span="8">
             类别
             <el-select v-model="selars" placeholder="请选择" @change="change">
-              <el-option
-                v-for="item in ars"
-                :key="item.id"
-                :label="item.displayName"
-                :value="item.id"
-              >
+              <el-option v-for="item in ars" :key="item.id" :label="item.displayName" :value="item.id">
               </el-option>
             </el-select>
           </el-col>
@@ -172,11 +111,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="创建时间">
-            <el-input
-              :value="form.creationTime | dateFormat"
-              disabled
-              style="width: 90%"
-            ></el-input>
+            <el-input :value="form.creationTime | dateFormat" disabled style="width: 90%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
@@ -186,11 +121,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="修改时间">
-            <el-input
-              :value="form.lastModificationTime | dateFormat"
-              disabled
-              style="width: 90%"
-            ></el-input>
+            <el-input :value="form.lastModificationTime | dateFormat" disabled style="width: 90%"></el-input>
           </el-form-item>
         </el-col>
       </el-form>
@@ -263,7 +194,7 @@ export default {
     createFilter(queryString) {
       return (tableData) => {
         return (
-          tableData.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+          tableData.displayName.toLowerCase().indexOf(queryString.toLowerCase()) != -1
         );
       };
     },
@@ -271,7 +202,7 @@ export default {
       this.page.Filter = item.displayName;
       this.item = item;
       this.formid = item.id;
-      console.log(item);
+      //console.log(item);
       //    quersmedicalid(item.id).then((res) => {
       //   console.log(res);
       //   this.form = res.data;
@@ -285,17 +216,7 @@ export default {
       // 调用 callback 返回建议列表的数据
       cb(tableDatas);
     },
-    // isinput(v) {
-    //   this.page.Filter = v;
-    //   console.log(this.page.Filter);
-    //   if (this.page.Filter == "") {
-    //     this.getlist();
-    //   } else {
-    //     physicallist(this.page).then((res) => {
-    //       this.tableData = res.data.items;
-    //     });
-    //   }
-    // },
+
     isselctvalue(v) {
       this.pages.TypeId = v;
       console.log(v);
@@ -326,7 +247,7 @@ export default {
               this.form = {};
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       }
     },
     //取消排序
@@ -422,7 +343,8 @@ export default {
       }
     },
     //点击列表通过id查询
-    rowick(row) {
+    rowclick(row) {
+      console.log("dianji")
       quersmedicalid(row.id).then((res) => {
         console.log(res);
         this.form = res.data;
@@ -466,12 +388,33 @@ export default {
       });
     },
     getlist() {
+      // conclusionacquisition(this.pages).then((res) => {
+      //   console.log(res);
+      //   this.initTableData = [...res.data.items];
+      //   this.tableData = res.data.items;
+      // });
+      this.getlistM();
+    },
+    getlistM(rowsid) {
       conclusionacquisition(this.pages).then((res) => {
         console.log(res);
         this.initTableData = [...res.data.items];
         this.tableData = res.data.items;
+
+        if (rowsid != null && rowsid != "") {
+          var row = this.tableData.filter(item => item.id == rowsid);
+          this.$refs.tableData.setCurrentRow(row[0]);
+          quersmedicalid(rowsid).then((res) => {
+            this.form = res.data;
+          });
+        }
       });
     },
+    selsearch(id, typeid) {
+      this.Selectvalue = typeid;
+      this.pages.TypeId = typeid;
+      this.getlistM(id);
+    }
   },
 };
 </script>
@@ -479,6 +422,7 @@ export default {
 ::v-deep .el-dialog__footer {
   margin-top: 30px;
 }
+
 .box {
   display: flex;
 }