diff --git a/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue b/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue
index 13492cd..06c67b5 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue
@@ -3,13 +3,13 @@
     <div class="historyTaking">
       <el-form id="formDiagnosis" ref="form" :model="diagnosis" label-width="120px" style="margin-top: 32px">
         <el-form-item label="诊断：" style="width: 540px" prop="zd">
-          <el-input v-model="diagnosis.zd" type="textarea" auto-complete="off" :rows="4" style="width: 420px" @focus="setCurWord('诊断')" />
+          <el-input v-model="diagnosis.zd" type="textarea" auto-complete="off" :rows="4" style="width: 420px" @focus="setCurWord('诊断',6)" />
         </el-form-item>
         <el-form-item label="处理：" style="width: 540px" prop="cl">
-          <el-input v-model="diagnosis.cl" type="textarea" auto-complete="off" :rows="4" style="width: 420px" @focus="setCurWord('处理')" />
+          <el-input v-model="diagnosis.cl" type="textarea" auto-complete="off" :rows="4" style="width: 420px" @focus="setCurWord('处理',7)" />
         </el-form-item>
         <el-form-item label="治疗意见：" style="width: 540px" prop="zlyj">
-          <el-input v-model="diagnosis.zlyj" type="textarea" auto-complete="off" :rows="4" style="width: 420px" @focus="setCurWord('治疗意见')" />
+          <el-input v-model="diagnosis.zlyj" type="textarea" auto-complete="off" :rows="4" style="width: 420px" @focus="setCurWord('治疗意见',8)" />
         </el-form-item>
       </el-form>
     </div>
@@ -43,8 +43,9 @@ export default {
         this.$refs.form.resetFields()
       })
     },
-    setCurWord(word) {
+    setCurWord(word, category) {
       this.curWord = word
+      this.$emit('getUsual', category)
     },
     combineWord(text) {
       switch (this.curWord) {
diff --git a/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue b/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue
index 7985187..a04279a 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/historyForm.vue
@@ -3,19 +3,19 @@
     <div class="historyTaking">
       <el-form id="medHistory" ref="form" :model="formData" label-width="130px">
         <el-form-item label="主诉：" prop="zhuSu">
-          <el-input v-model="formData.zhuSu" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('主诉')" />
+          <el-input v-model="formData.zhuSu" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('主诉',1)" />
         </el-form-item>
         <el-form-item label="现病史：" prop="xbs">
-          <el-input v-model="formData.xbs" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('现病史')" />
+          <el-input v-model="formData.xbs" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('现病史',2)" />
         </el-form-item>
         <el-form-item label="既往病史：" prop="jws">
-          <el-input v-model="formData.jws" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('既往病史')" />
+          <el-input v-model="formData.jws" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('既往病史',3)" />
         </el-form-item>
         <el-form-item label="过敏史：" prop="gms">
-          <el-input v-model="formData.gms" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('过敏史')" />
+          <el-input v-model="formData.gms" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('过敏史',4)" />
         </el-form-item>
         <el-form-item label="周身其他病史：" prop="zsqtbs">
-          <el-input v-model="formData.zsqtbs" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('周身其他病史')" />
+          <el-input v-model="formData.zsqtbs" type="textarea" auto-complete="off" :rows="4" @focus="setCurWord('周身其他病史',5)" />
         </el-form-item>
       </el-form>
     </div>
@@ -63,8 +63,9 @@ export default {
         this.$refs.form.resetFields()
       })
     },
-    setCurWord(word) {
+    setCurWord(word, category) {
       this.curWord = word
+      this.$emit('getUsual', category)
     },
     openTextTemplate() {
       this.$emit('openDrawer', this.curWord)
diff --git a/src/components/360View/medicalRecord/outPatientRecord/historyRecordForm.vue b/src/components/360View/medicalRecord/outPatientRecord/historyRecordForm.vue
index 976da47..aef7ca4 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/historyRecordForm.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/historyRecordForm.vue
@@ -19,6 +19,9 @@
       <div v-if="historyData">
         日期：{{ historyData.createDate }}
       </div>
+      <div class="introduce" @click="introduceHistory(historyData)">
+        【引入】
+      </div>
     </div>
     <div v-if="historyData">
       <div class="labelItem">
@@ -120,4 +123,8 @@ export default {
     padding-right: 20px;
   }
 }
+.introduce{
+  color: #409EFF;
+  cursor: pointer;
+}
 </style>
diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue
index ea2eb8e..f56b324 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/index.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue
@@ -11,7 +11,7 @@
     </div>
     <el-tabs v-model="comonFormActive" type="border-card">
       <el-tab-pane label="病史采集" name="1" style="height: 100%">
-        <history-form ref="history" :common-list="commonList" :form-data="formData" @openDrawer="openDrawer" />
+        <history-form ref="history" :common-list="commonList" :form-data="formData" @openDrawer="openDrawer" @getUsual="queryCommonWord" />
       </el-tab-pane>
       <el-tab-pane label="前段检查" name="2" style="height: 100%">
         <forePart ref="foreParts" :patient-id="patientId" :is-search="isSearch" :only-read="onlyRead" :case-id="caseId" :is-platform="isPlatform" />
@@ -23,7 +23,7 @@
         <specialExamine ref="examines" :patient-id="patientId" :is-search="isSearch" :case-id="caseId" />
       </el-tab-pane>
       <el-tab-pane label="诊断处置" name="5">
-        <diagnosis-form ref="diagnosis" :common-list="commonList" :diagnosis="diagnosis" @openDrawer="openDrawer" />
+        <diagnosis-form ref="diagnosis" :common-list="commonList" :diagnosis="diagnosis" @openDrawer="openDrawer" @getUsual="queryCommonWord" />
       </el-tab-pane>
     </el-tabs>
     <!--    历史病历查看及引入  -->
@@ -159,7 +159,6 @@ export default {
     this.jzNumber = window.sessionStorage.getItem('jzNumber')
     await this.getMedicalHistory()
     await this.getDiagnosis()
-    this.queryCommonWord()
   },
   methods: {
     // 保存表单
@@ -271,6 +270,16 @@ export default {
         case '治疗意见':
           this.diagnosis.zlyj = param.content
           break
+        default:
+          this.formData.zhuSu = param.content.zhuSu
+          this.formData.xbs = param.content.xbs
+          this.formData.jws = param.content.jws
+          this.formData.gms = param.content.gms
+          this.formData.zsqtbs = param.content.zsqtbs
+          this.diagnosis.zd = param.content.zd
+          this.diagnosis.cl = param.content.cl
+          this.diagnosis.zlyj = param.content.zlyj
+          break
       }
     },
     // 引入模板
@@ -328,8 +337,12 @@ export default {
       }
     },
     // 换取常用关键词
-    queryCommonWord() {
-      this.$http.get('/bd/template/getUsual').then(res => {
+    queryCommonWord(category) {
+      this.$http.get('/bd/template/getUsual', {
+        params: {
+          category
+        }
+      }).then(res => {
         this.commonList = res.data.data
       })
     },
diff --git a/src/page-subspecialty/views/modules/template/manage/add-fenlei.vue b/src/page-subspecialty/views/modules/template/manage/add-fenlei.vue
index e241534..e0296d9 100644
--- a/src/page-subspecialty/views/modules/template/manage/add-fenlei.vue
+++ b/src/page-subspecialty/views/modules/template/manage/add-fenlei.vue
@@ -25,6 +25,17 @@
         <el-form-item prop="sort" label="排序">
           <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序" />
         </el-form-item>
+        <!-- 类型 -->
+        <el-form-item v-if="!modelType && dataForm.pid==='0'||!dataForm.pid" prop="sort" label="排序">
+          <el-select v-model="dataForm.category" filterable placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <template slot="footer">
         <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -50,10 +61,39 @@ export default {
     return {
       visible: false,
       modelType: '',
+      options: [{
+        value: 1,
+        label: '主诉'
+      }, {
+        value: 2,
+        label: '现病史'
+      }, {
+        value: 3,
+        label: '既往病史'
+      }, {
+        value: 4,
+        label: '过敏史'
+      }, {
+        value: 5,
+        label: '周身其他病史'
+      }, {
+        value: 6,
+        label: '诊断'
+      }, {
+        value: 7,
+        label: '处理'
+      }, {
+        value: 8,
+        label: '治疗意见'
+      }, {
+        value: 0,
+        label: '通用'
+      }],
       dataForm: {
         pid: 0,
         // 类型 1:科室，2:个人
         type: '',
+        category: '',
         sort: 0,
         content: ''
       }
@@ -74,7 +114,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.dataForm.resetFields()
         if (this.dataForm.id) {
-          !this.modelType && this.getInfo()
+          this.getInfo()
         }
       })
     },
diff --git a/src/page-subspecialty/views/modules/template/manage/tab-fun.vue b/src/page-subspecialty/views/modules/template/manage/tab-fun.vue
index 3cd715f..31a0b3a 100644
--- a/src/page-subspecialty/views/modules/template/manage/tab-fun.vue
+++ b/src/page-subspecialty/views/modules/template/manage/tab-fun.vue
@@ -9,7 +9,6 @@
           node-key="id"
           accordion
           highlight-current
-          :expand-on-click-node="false"
         >
           <span slot-scope="{ node, data }" class="custom-tree-node treeItem" @click="leftListClick(data)">
             <el-tooltip show-overflow-tip class="item" effect="dark" placement="top-start">