diff --git a/src/views/all/modules/data/triage/triageRecordList.vue b/src/views/all/modules/data/triage/triageRecordList.vue
index d51840c3d3c4777c4a119c6eaf3ca2389c17ebd8..a24b777a587f40b05ccbbebc2e8eabc0f262ed4f 100644
--- a/src/views/all/modules/data/triage/triageRecordList.vue
+++ b/src/views/all/modules/data/triage/triageRecordList.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="triageRegistrationWrapper">
-    <el-header class="pageHeader g-relative">
+  <div class="triageRecordListWrapper">
+    <div class="pageHeader g-relative">
       <div class="header_form">
         <el-form
           :inline="true"
@@ -8,7 +8,10 @@
           label-width="90px"
           ref="searchForm"
         >
-          <div class="searchForm">
+          <div
+            class="searchForm"
+            style="float:left"
+          >
             <el-form-item
               prop="startTime"
               label="分诊时间："
@@ -47,66 +50,100 @@
               >
               </el-date-picker>
             </el-form-item>
-            <el-form-item
-              prop="patientName"
-              label="患者姓名"
-              class="header_form_item"
+          </div>
+          <el-form-item
+            prop="patientName"
+            label="患者姓名"
+            class="header_form_item"
+          >
+            <el-input
+              v-model="searchForm.patientName"
+              size="mini"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="greenType"
+            label="重点病种："
+            class="header_form_item"
+          >
+            <el-select
+              v-model="searchForm.greenType"
+              clearable
+              placeholder="请选择"
+              size="mini"
+              style="width: 178px;"
             >
-              <el-input
-                v-model="searchForm.patientName"
-                size="mini"
-              ></el-input>
-            </el-form-item>
-            <el-form-item
-              prop="greenType"
-              label="重点病种："
-              class="header_form_item"
+              <el-option
+                label="全部"
+                value=""
+              />
+              <el-option
+                label="胸痛中心"
+                :value="1"
+              />
+              <el-option
+                label="卒中中心"
+                :value="2"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            prop="gradeId"
+            label="分诊级别："
+            class="header_form_item"
+          >
+            <el-select
+              v-model="searchForm.gradeId"
+              clearable
+              placeholder="请选择"
+              size="mini"
+              style="width: 178px;"
             >
-              <el-select
-                v-model="searchForm.greenType"
-                clearable
-                placeholder="请选择"
-                size="mini"
-                style="width: 178px;"
-              >
-                <el-option
-                  label="全部"
-                  value=""
-                />
-                <el-option
-                  label="胸痛中心"
-                  :value="1"
-                />
-                <el-option
-                  label="卒中中心"
-                  :value="2"
-                />
-              </el-select>
-            </el-form-item>
-          </div>
+              <el-option
+                label="全部"
+                value=""
+              />
+              <el-option
+                label="一级"
+                value="一级"
+              />
+              <el-option
+                label="二级"
+                value="二级"
+              />
+              <el-option
+                label="三级"
+                value="三级"
+              />
+              <el-option
+                label="四级"
+                value="四级"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="float:right">
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-search"
+              @click="searchTableData()"
+            >查询</el-button>
+            <el-button
+              type="danger"
+              size="mini"
+              icon="el-icon-refresh"
+              @click="resetForm('searchForm')"
+            >重置</el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-download"
+              @click="exportTable()"
+            >导出</el-button>
+          </el-form-item>
         </el-form>
       </div>
-      <div class="header_btn">
-        <el-button
-          type="primary"
-          size="mini"
-          icon="el-icon-search"
-          @click="searchTableData()"
-        >查询</el-button>
-        <el-button
-          type="danger"
-          size="mini"
-          icon="el-icon-refresh"
-          @click="resetForm('searchForm')"
-        >重置</el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          icon="el-icon-download"
-          @click="exportTable()"
-        >导出</el-button>
-      </div>
-    </el-header>
+    </div>
     <el-main class="pageMain">
       <table-mixin
         :pageSize="pageSize"
@@ -319,6 +356,7 @@ export default {
       let param = {
         'patientName': this.searchForm.patientName,
         'greenType': this.searchForm.greenType,
+        'gradeId': this.searchForm.gradeId,
         'beginTriageTime': beginTime,
         'endTriageTime': endTime,
         'pageSize': this.pageSize,
@@ -362,6 +400,7 @@ export default {
         'endTriageTime': endTime,
         'patientName': this.searchForm.patientName,
         'greenType': this.searchForm.greenType,
+        'gradeId': this.searchForm.gradeId
       }
       this.$axios({
         url: global.url + '/api/triage/his/expTbTriageFormReport',
@@ -385,7 +424,7 @@ export default {
 </script>
 
 <style lang="scss">
-.triageRegistrationWrapper {
+.triageRecordListWrapper {
   width: 100%;
   height: 100%;
   padding-top: 10px;
diff --git a/src/views/all/modules/data/triage/triageRegistration.vue b/src/views/all/modules/data/triage/triageRegistration.vue
index 67e507084e5eb9a38a1ee4808aa91276f4f6fca7..b2f4a99041b3226d973646ac71aaf69ecb56cd1b 100644
--- a/src/views/all/modules/data/triage/triageRegistration.vue
+++ b/src/views/all/modules/data/triage/triageRegistration.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="triageRegistrationWrapper">
-    <el-header class="pageHeader g-relative">
+    <div class="pageHeader g-relative">
       <div class="header_form">
         <el-form
           :inline="true"
@@ -8,7 +8,10 @@
           label-width="90px"
           ref="searchForm"
         >
-          <div class="searchForm">
+          <div
+            class="searchForm"
+            style="float:left"
+          >
             <el-form-item
               prop="startTime"
               label="分诊时间："
@@ -47,68 +50,114 @@
               >
               </el-date-picker>
             </el-form-item>
-            <el-form-item
-              prop="createUserId"
-              label="分诊护士："
-              class="header_form_item"
+          </div>
+          <el-form-item
+            prop="createUserId"
+            label="分诊护士："
+            class="header_form_item"
+          >
+            <el-select
+              v-model="searchForm.createUserId"
+              clearable
+              placeholder="请选择"
+              size="mini"
+              style="width: 178px;"
             >
-              <el-select
-                v-model="searchForm.createUserId"
-                clearable
-                placeholder="请选择"
-                size="mini"
-                style="width: 178px;"
+              <el-option
+                v-for="(item,index) in options"
+                :key="index"
+                :label="item.userName"
+                :value="item.userId"
               >
-                <el-option
-                  v-for="(item,index) in options"
-                  :key="index"
-                  :label="item.userName"
-                  :value="item.userId"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item
-              prop="greenType"
-              label="重点病种："
-              class="header_form_item"
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            prop="greenType"
+            label="重点病种："
+            class="header_form_item"
+          >
+            <el-select
+              v-model="searchForm.greenType"
+              clearable
+              placeholder="请选择"
+              size="mini"
+              style="width: 178px;"
             >
-              <el-select
-                v-model="searchForm.greenType"
-                clearable
-                placeholder="请选择"
-                size="mini"
-                style="width: 178px;"
-              >
-                <el-option label="全部" value="" />
-                <el-option label="胸痛中心" :value="1" />
-                <el-option label="卒中中心" :value="2" />
-              </el-select>
-            </el-form-item>
-          </div>
+              <el-option
+                label="全部"
+                value=""
+              />
+              <el-option
+                label="胸痛中心"
+                :value="1"
+              />
+              <el-option
+                label="卒中中心"
+                :value="2"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            prop="gradeId"
+            label="分诊级别："
+            class="header_form_item"
+          >
+            <el-select
+              v-model="searchForm.gradeId"
+              clearable
+              placeholder="请选择"
+              size="mini"
+              style="width: 178px;"
+            >
+              <el-option
+                label="全部"
+                value=""
+              />
+              <el-option
+                label="一级"
+                :value="1"
+              />
+              <el-option
+                label="二级"
+                :value="2"
+              />
+              <el-option
+                label="三级"
+                :value="3"
+              />
+              <el-option
+                label="四级"
+                :value="4"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="float:right">
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-search"
+              @click="searchTableData()"
+            >查询</el-button>
+            <el-button
+              type="danger"
+              size="mini"
+              icon="el-icon-refresh"
+              @click="resetForm('searchForm')"
+            >重置</el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-download"
+              @click="exportTable()"
+            >导出</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="header_btn">
-        <el-button
-          type="primary"
-          size="mini"
-          icon="el-icon-search"
-          @click="searchTableData()"
-        >查询</el-button>
-        <el-button
-          type="danger"
-          size="mini"
-          icon="el-icon-refresh"
-          @click="resetForm('searchForm')"
-        >重置</el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          icon="el-icon-download"
-          @click="exportTable()"
-        >导出</el-button>
+
       </div>
-    </el-header>
+    </div>
     <el-main class="pageMain">
       <div class="chartsContainer g-m-b-30">
         <el-tabs
@@ -427,9 +476,10 @@ export default {
         'greenType': this.searchForm.greenType,
         'pageSize': this.pageSize,
         'pageNo': this.pageNum,
+        'gradeId': this.searchForm.gradeId,
         'isBasics': this.isBasics
       };
-      
+
       this.searchParams = param
       this.$axios({
         url: global.url + '/api/emergency/triage/getTriageRecordList',
@@ -655,6 +705,7 @@ export default {
       let param = {
         'createUserId': this.searchForm.createUserId,
         'greenType': this.searchForm.greenType,
+        'gradeId': this.searchForm.gradeId,
         'beginTime': beginTime,
         'endTime': endTime,
         'isBasics': this.isBasics
@@ -701,16 +752,14 @@ export default {
 
   .pageHeader {
     /* height: 130px !important; */
-    display: flex;
     background-color: #fff;
-    align-items: center;
-    box-sizing: border-box;
+    margin-bottom: 20px;
   }
 
   .header_form {
-    flex: 5;
-    display: flex;
-    flex-direction: column;
+    // flex: 5;
+    // display: flex;
+    // flex-direction: column;
     .searchForm {
       display: flex;
       align-items: center;
@@ -720,15 +769,16 @@ export default {
     }
   }
 
-  .header_btn {
-    flex: 1;
-    display: flex;
-    align-items: flex-start;
-  }
+  // .header_btn {
+  //   flex: 1;
+  //   display: flex;
+  //   align-items: flex-start;
+  // }
 
   .pageMain {
     background: #fff;
     height: calc(100% - 160px);
+    width: 100%;
   }
 
   .pageMain /deep/ .cell {