diff --git a/src/components/itemSet/ReferenceRange.vue b/src/components/itemSet/ReferenceRange.vue
index 4002e16..8a765eb 100644
--- a/src/components/itemSet/ReferenceRange.vue
+++ b/src/components/itemSet/ReferenceRange.vue
@@ -267,10 +267,12 @@ export default {
       }
     },
     rowick(row) {
-       getapi(`/api/app/reference-range/${row.id}`).then((res) => {
-        this.curRowes = res.data;
-        this.id = res.data.id;
-      });
+      this.curRowes = row;
+      this.id = row.id;
+      //  getapi(`/api/app/reference-range/${row.id}`).then((res) => {
+      //   this.curRowes = res.data;
+      //   this.id = res.data.id;
+      // });
     },
     quckEditdigoisce(e){
       if(!e){
@@ -312,6 +314,9 @@ export default {
       this.form = {
         itemId: this.itemId,
         referenceRangeTypeFlag: this.ReferenceRangeTypeFlag,
+        forSexId: "U",
+        ageLowerLimit: "0",
+        ageUpperLimit: "200",
       };
     },
 
diff --git a/src/components/report/AsbitemOCX.vue b/src/components/report/AsbitemOCX.vue
index 6182b48..d189944 100644
--- a/src/components/report/AsbitemOCX.vue
+++ b/src/components/report/AsbitemOCX.vue
@@ -5,7 +5,7 @@
         <span>项目类别</span>
         <el-cascader :options="dict.itemTypeTree" v-model="itemTypeIds" style="margin-left: 3px;width:160px;"
           :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" :show-all-levels="false"
-          clearable filterable @change="parseAsbitem" size="small">
+          clearable filterable @change="parseAsbitem" size="small" ref="example" popper-class="example" >
         </el-cascader>
       </div>
       <div class="mainareaBox">
@@ -188,13 +188,16 @@ export default {
     },
 
     //分析可选组合项目，及快速可选组合项目的数据
-    parseAsbitem() {
+    parseAsbitem(v) {
       this.asbItemQuick = deepCopy(this.dict.asbItemAll);
       arrayReduce(this.asbItemQuick, this.report.dataAsbitemOCX, 'id');
       this.asbItems = deepCopy(this.asbItemQuick);
       if (this.itemTypeIds && this.itemTypeIds.length > 0) {
         this.asbItems = arrayFilter(this.asbItems, 'itemTypeId', this.itemTypeIds[this.itemTypeIds.length - 1])
       }
+      if(v){
+        this.$refs.example.toggleDropDownVisible();
+      }
     },
 
 
@@ -395,4 +398,24 @@ export default {
 
 ::v-deep .el-icon-date:before {
   content: ""
-}</style>
\ No newline at end of file
+}</style>
+<style>
+.example .el-cascader-panel .el-radio {
+    width: 100%;
+   	height: 100%;
+    z-index: 10;
+   	position: absolute;
+   	top: 0px;
+   	right: 0px; 			
+  }
+   
+ .example .el-cascader-panel .el-radio__input {
+   	/* margin-top: 10px;
+   	margin-left: 8px; 			 */
+    display: none;
+ }
+   
+ .example .el-cascader-panel .el-cascader-node__postfix {
+   		top: 10px; 			
+  }
+</style>
\ No newline at end of file
diff --git a/src/components/report/StatisticsOCX.vue b/src/components/report/StatisticsOCX.vue
index 2aacd75..9ee7551 100644
--- a/src/components/report/StatisticsOCX.vue
+++ b/src/components/report/StatisticsOCX.vue
@@ -196,7 +196,7 @@ export default {
     addAbs(asbItemChoosed) {
 
       if (asbItemChoosed.length < 1) {
-        alert("请选择要添加的组合项目")
+        alert("请选择要添加的诊断")
         return
       }
       arrayReduce(this.asbItems, asbItemChoosed, 'id')
@@ -215,7 +215,7 @@ export default {
     ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
     delAbs(absForDel) {
       if (absForDel.length < 1) {
-        alert("请选择要移除的组合项目")
+        alert("请选择要移除的诊断")
         return
       }
       arrayReduce(this.report.dataAsbitemOCX, absForDel, 'id');
diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index 293965c..d73db02 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -1,23 +1,19 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card style="height: 600px; border-radius: 15px" class="elcard">
+      <el-card style="height: 600px; border-radius: 15px;padding-bottom: 15px;" class="elcard">
         <div class="allC">
-          <i
-            class="el-icon-link"
-            v-if="tableData.length == '0' ? false : true"
-          ></i
-          ><span class="publiccss">项目类别</span>
+          <span class="publiccss">项目类别</span>
           <div
             v-if="tableData.length == '0' ? true : false"
-            @click="append(node, data)"
           >
-            <i class="el-icon-link" @click="append"></i><span> 项目类别</span>
-          </div>
-          <div style="margin-top: 20px">
-            <!-- <el-button type="" @click="addll" class="commonbutton"
-              >新增同集</el-button
-            > -->
+            <el-button
+                  type="primary"
+                  size="mini"
+                  style="padding: 5px; font-size: 15px;"
+                  @click="append"
+                  >新增项目类别</el-button
+                >
           </div>
           <el-tree
             :default-expand-all="true"
@@ -27,7 +23,7 @@
             :show-checkbox="false"
             ref="tree"
             node-key="id"
-            style="width: 30%; margin-top: 20px"
+            style="width: 30%; margin-top: 5px"
           >
             <span slot-scope="{ node, data }">
               <span style="padding: 5px">{{ node.label }}</span>
@@ -312,7 +308,6 @@ export default {
   },
   methods: {
     cascaderchang(v) {
-      console.log(this.departmentname);
       this.departmentname = v[v.length - 1];
     },
     //编辑弹框
@@ -322,7 +317,6 @@ export default {
       this.title = 2;
       this.dialogVisible = true;
       basicsetings().then((res) => {
-        console.log(res);
         this.guideoptions = res.data.items;
       });
       physicalexaminationlist().then((res) => {
@@ -330,7 +324,6 @@ export default {
       });
       projecttype(data.id).then((res) => {
         this.form = res.data;
-        console.log(res);
       });
       // getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
       //   this.itemtypedata = res.data;
@@ -340,7 +333,6 @@ export default {
       getapi(`/api/app/itemtype/getbycodeparent?ItemTypeId=${data.id}`).then(
         (res) => {
           this.itemtypedata = res.data;
-          console.log(res, "qqwqqqqqqqqqqqqqqqqq");
         }
       );
     },
@@ -357,18 +349,18 @@ export default {
       }).then(() => {
         projecteditid(data.id).then((res) => {
           if (res.code == 0) {
-            console.log("删除成功");
+            this.$message.success("删除成功");
             this.getlist();
           } else {
           }
         });
       });
-      console.log(node, data);
     },
     append(node, data) {
-      console.log(node, data);
       this.form = {};
-      this.form.parentId = data.id;
+      if(node&& data){
+        this.form.parentId = data.id;
+      }
       this.dialogVisible = true;
       this.$nextTick(() => {
         this.$refs.refinput.focus();
@@ -381,15 +373,15 @@ export default {
       });
     },
     //新增弹框
-    addll() {
+    addll(node, data) {
       this.form = {};
+      this.form.parentId = data.parentId;
       this.dialogVisible = true;
       this.title = 1;
       this.$nextTick(() => {
         this.$refs.refinput.focus();
       });
       basicsetings().then((res) => {
-        console.log(res);
         this.guideoptions = res.data.items;
       });
       physicalexaminationlist().then((res) => {
@@ -398,7 +390,6 @@ export default {
     },
     //确定新增或者编辑
     addoredit() {
-      console.log(this.form.parentId);
       this.$refs.ruleForm.validate((v) => {
         if (v) {
           if (this.title == 1) {
@@ -418,7 +409,7 @@ export default {
                 guidTypeId: this.form.guidTypeId,
                 medicalReportTypeId: this.form.medicalReportTypeId,
               }).then((res) => {
-                console.log("新增成功");
+                this.$message.success("新增成功");
                 this.getlist();
                 this.dialogVisible = false;
               });
@@ -431,7 +422,7 @@ export default {
                 guidTypeId: this.form.guidTypeId,
                 medicalReportTypeId: this.form.medicalReportTypeId,
               }).then((res) => {
-                console.log("新增成功");
+                this.$message.success("新增成功");
                 this.getlist();
                 this.dialogVisible = false;
               });
@@ -447,7 +438,7 @@ export default {
               guidTypeId: this.form.guidTypeId,
               medicalReportTypeId: this.form.medicalReportTypeId,
             }).then((res) => {
-              console.log("修改成功");
+              this.$message.success("修改成功");
               this.getlist();
               this.dialogVisible = false;
             });
@@ -457,23 +448,27 @@ export default {
     },
     // 点击获取每一列
     rowick(row) {
-      console.log(row, "11111");
     },
     getlist() {
       projectlist(this.pages).then((res) => {
         this.tableData = res.data;
-        console.log(res);
       });
     },
   },
 };
 </script>
 <style scoped>
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global.css";
 ::v-deep .el-form-item {
   margin-bottom: 10px;
 }
 ::v-deep .el-tree-node__content {
-  margin-top: 5px;
+  padding-bottom: 5px;
 }
 .box {
   display: flex;
diff --git a/src/views/customerReport/combinationDetails.vue b/src/views/customerReport/combinationDetails.vue
index 62b21de..b3bc14e 100644
--- a/src/views/customerReport/combinationDetails.vue
+++ b/src/views/customerReport/combinationDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <div slot="header">组合项目检查状态</div>
+      <div slot="header">组合项目具体结果明细统计</div>
       <div :style="'display: block; width:' + (window.pageWidth - 45) + 'px;'">
         <div style="display: flex; flex-wrap: wrap; height: 35px">
           <div class="query">
@@ -57,9 +57,7 @@
             </el-select>
           </div> -->
           <div class="query">
-            <el-button @click="btnQuery" size="small"
-              >查询</el-button
-            >
+            <el-button @click="btnQuery" size="small">查询</el-button>
           </div>
           <div class="query">
             <el-button @click="handleExport" size="small">导出excel</el-button>
@@ -78,6 +76,10 @@
             ref="dataList"
             :row-class-name="tableRowClassName"
             id="table"
+            show-summary
+            :summary-method="summarizeRegisterCount"
+            :cell-style="tableRowClassNames"
+            :header-cell-class-name="addClass" 
           >
             <el-table-column prop="patientName" label="姓名"></el-table-column>
             <el-table-column prop="sexName" label="性别"></el-table-column>
@@ -146,6 +148,7 @@ export default {
       dataList: [], //列表数据
       columnData: [],
       flag: true,
+      category: [],
     };
   },
 
@@ -312,29 +315,46 @@ export default {
     handleExport() {
       exportToExcel("#table", "组合项目结果明细", false);
     },
+    tableRowClassNames({ row, column, rowIndex, columnIndex }) {
+        if(column.label.length>2){
+           let columnLabel= column.label.slice(-2)
+           if(columnLabel=="小结"){
+            return { backgroundColor: "#F5F7FA" };
+           }
+        }
+    },
+    addClass({ row, column, rowIndex, columnIndex }){
+         if(column.label.length>2){
+           let columnLabel= column.label.slice(-2)
+           if(columnLabel=="小结"){
+            return "backcolor";
+           }
+        }
+    },
+   summarizeRegisterCount(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+
+        if (index === 1) {
+          sums[index] = "共" + data.length + "人";
+        } else {
+          sums[index] = "";
+        }
+      });
+
+      return sums;
+    },
+
     //查询
     btnQuery() {
       let body = {},
         customerOrgs = [],
         asbitemIds = [];
-      // {
-      //   "customerOrgs": [
-      //     {
-      //       "customerOrgId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-      //       "customerOrgRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-      //       "customerOrgGroupId": [
-      //         "3fa85f64-5717-4562-b3fc-2c963f66afa6"
-      //       ],
-      //       "dateType": "string",
-      //       "startDate": "string",
-      //       "endDate": "string"
-      //     }
-      //   ],
-      //   "asbitemIds": [
-      //     "3fa85f64-5717-4562-b3fc-2c963f66afa6"
-      //   ],
-      //   "completeFlag": "string"
-      // }
 
       if (this.report.dataCusOrgOCX.length > 0) {
         this.report.dataCusOrgOCX.forEach((e) => {
@@ -376,169 +396,75 @@ export default {
       //   body.completeFlag = this.patientRegister.query.checkCompleteFlag;
 
       //console.log('/api/app/peisreport/getpatientregisterreport',body)
-
       postapi("/api/customerreport/getasbitemspecificresultreport", body).then(
         (res) => {
           if (res.code != -1) {
-            let bodys= res.data
-            // let bodys = [
-            //   {
-            //     medicalTimes: 0,
-            //     patientName: "小王",
-            //     sexName: "string",
-            //     age: 0,
-            //     registerChecks: [
-            //       {
-            //         registerCheckId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-            //         checkName: "血常规",
-            //         registerCheckItems: [
-            //           {
-            //             itemName: "血型",
-            //             result: "O",
-            //           },
-            //           {
-            //             itemName: "ct",
-            //             result: "良好",
-            //           },
-            //         ],
-            //         registerCheckSummarys: "血常规优秀",
-            //       },
-            //       {
-            //         registerCheckId: "3fa85f64-5717-4562-b3fc-2c963f66afa5",
-            //         checkName: "乙肝三项",
-            //         registerCheckItems: [
-            //           {
-            //             itemName: "乙肝",
-            //             result: "A",
-            //           },
-            //           {
-            //             itemName: "血液",
-            //             result: "B",
-            //           },
-            //           {
-            //             itemName: "ct",
-            //             result: "C",
-            //           },
-            //         ],
-            //         registerCheckSummarys: "乙肝三项良好",
-            //       },
-            //     ],
-            //   },
-            //   {
-            //     medicalTimes: 0,
-            //     patientName: "小李",
-            //     sexName: "string",
-            //     age: 0,
-            //     registerChecks: [
-            //       {
-            //         registerCheckId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-            //         checkName: "血常规",
-            //         registerCheckItems: [
-            //           {
-            //             itemName: "血型",
-            //             result: "A",
-            //           },
-            //           {
-            //             itemName: "ct",
-            //             result: "危险",
-            //           },
-            //           {
-            //             itemName: "核磁",
-            //             result: "有",
-            //           },
-            //         ],
-            //         registerCheckSummarys: "血常规危险",
-            //       },
-            //       {
-            //         registerCheckId: "3fa85f64-5717-4562-b3fc-2c963f66afa5",
-            //         checkName: "乙肝三项",
-            //         registerCheckItems: [
-            //           {
-            //             itemName: "乙肝",
-            //             result: "B",
-            //           },
-            //           {
-            //             itemName: "血液",
-            //             result: "A",
-            //           },
-            //         ],
-            //         registerCheckSummarys: "乙肝三项危险",
-            //       },
-            //       {
-            //         registerCheckId: "3fa85f64-5717-4562-b3fc-2c963f66afa4",
-            //         checkName: "血型鉴侧",
-            //         registerCheckItems: [
-            //           {
-            //             itemName: "a实验",
-            //             result: "7",
-            //           },
-            //           {
-            //             itemName: "b实验",
-            //             result: "8",
-            //           },
-            //         ],
-            //         registerCheckSummarys: "乙肝三项危险",
-            //       },
-            //     ],
-            //   },
-            // ];
+            let bodys = res.data;
             let that = this;
             let template = {
               prop: "",
               lable: "",
             };
+            that.columnData = [];
+            that.category = [];
             for (let i = 0; i < bodys.length; i++) {
               for (let k = 0; k < bodys[i].registerChecks.length; k++) {
-                for (
-                  let j = 0;
-                  j < bodys[i].registerChecks[k].registerCheckItems.length;
-                  j++
-                ) {
-                  let templatess = JSON.parse(JSON.stringify(template));
-                  templatess.prop =
-                    // bodys[i].registerChecks[k].registerCheckId +
-                    bodys[i].registerChecks[k].checkName +
-                    bodys[i].registerChecks[k].registerCheckItems[j].itemName;
-                  templatess.lable =
-                    bodys[i].registerChecks[k].checkName +'/'+
-                    bodys[i].registerChecks[k].registerCheckItems[j].itemName;
-                  that.columnData.push(templatess);
-                  this.$set(
-                    bodys[i],
-                    // bodys[i].registerChecks[k].registerCheckId +
-                      bodys[i].registerChecks[k].checkName +
-                      bodys[i].registerChecks[k].registerCheckItems[j].itemName,
-                    bodys[i].registerChecks[k].registerCheckItems[j].result
-                  );
-                }
-                // if(bodys[i].registerChecks[k].registerCheckSummarys!=''&&bodys[i].registerChecks[k].registerCheckSummarys!=null){
-                    let templates = JSON.parse(JSON.stringify(template));
-                templates.prop =
-                //   bodys[i].registerChecks[k].registerCheckId +
-                  bodys[i].registerChecks[k].checkName +
-                  "小结";
-                templates.lable = bodys[i].registerChecks[k].checkName+'/' + "小结";
-                that.columnData.push(templates);
-                this.$set(
+                that.category.push(bodys[i].registerChecks[k].checkName);
+              }
+            }
+            that.category = Array.from(new Set(that.category));
+            for (let m = 0; m < that.category.length; m++) {
+              for (let i = 0; i < bodys.length; i++) {
+                for (let k = 0; k < bodys[i].registerChecks.length; k++) {
+                                        this.$set(
                   bodys[i],
                 //   bodys[i].registerChecks[k].registerCheckId +
                     bodys[i].registerChecks[k].checkName +
                     "小结",
                   bodys[i].registerChecks[k].registerCheckSummarys
                 );
-                // }
+                  if (bodys[i].registerChecks[k].checkName == that.category[m]) {
+                    for (let j = 0;j < bodys[i].registerChecks[k].registerCheckItems.length;j++) {
+                      let templatess = JSON.parse(JSON.stringify(template));
+                      templatess.prop =
+                        // bodys[i].registerChecks[k].registerCheckId +
+                        bodys[i].registerChecks[k].checkName +
+                        bodys[i].registerChecks[k].registerCheckItems[j]
+                          .itemName;
+                      templatess.lable =
+                        // bodys[i].registerChecks[k].checkName +
+                        // "/" +
+                        bodys[i].registerChecks[k].registerCheckItems[j]
+                          .itemName;
+                      that.columnData.push(templatess);
+                      this.$set(
+                        bodys[i],
+                        // bodys[i].registerChecks[k].registerCheckId +
+                        bodys[i].registerChecks[k].checkName +
+                          bodys[i].registerChecks[k].registerCheckItems[j]
+                            .itemName,
+                        bodys[i].registerChecks[k].registerCheckItems[j].result
+                      )
+                    }
+                  }
+                }
               }
+              let templates = JSON.parse(JSON.stringify(template));
+              templates.prop =that.category[m] +"小结";
+              templates.lable = that.category[m] + "小结";
+              that.columnData.push(templates);
             }
-            this.$nextTick(()=>{
-                this.$refs.dataList.doLayout()
-            })
+
+            this.$nextTick(() => {
+              this.$refs.dataList.doLayout();
+            });
             let map = new Map();
             let qc = this.columnData.filter(
               (key) => !map.has(key.prop) && map.set(key.prop, 1)
             );
-            qc.sort(function (a, b) {
-                return a.lable < b.lable ? -1 : 1; //根据名称属性进行排序
-            })
+            // qc.sort(function (a, b) {
+            //     return a.lable < b.lable ? -1 : 1; //根据名称属性进行排序
+            // })
 
             this.columnData = qc;
             this.dataList = bodys;
@@ -570,4 +496,7 @@ export default {
 .query {
   margin-left: 10px;
 }
+::v-deep .el-table__header-wrapper th.backcolor {
+  background-color: #F5F7FA;
+}
 </style>
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index d8d8f7e..ecf499e 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -6,7 +6,7 @@
         <div style="display: flex;margin-top:7px;">
           <div style="width: 15%;">
             <div>
-              <el-select v-model="department" placeholder="请选择项目类别" filterable :filter-method="remoteMethodes" default-first-option @change="quckDepartments" clearable>
+              <el-select v-model="department" placeholder="请选择组合项目" filterable :filter-method="remoteMethodes" default-first-option @change="quckDepartments" clearable>
                 <el-option
                   v-for="item in quckDepartment"
                   :key="item.id"
@@ -16,7 +16,7 @@
                 </el-option>
               </el-select>
             </div>
-            <div :style="'margin-top: 10px;overflow: scroll;border: 1px solid;height:'+ (window.pageHeight < 600 ? 410 : window.pageHeight - 200) + 'px;'">
+            <div :style="'margin-top: 10px;overflow: scroll;border: 1px solid;height:'+ (window.pageHeight < 660 ? 450 : window.pageHeight - 190) + 'px;'">
               <el-tree
               :data="itemTypeId"
               :props="treeprops"
@@ -33,7 +33,7 @@
           :data="tableData"
           style="width: 100%;"
           row-key="id"
-          :height="window.pageHeight < 668 ? 200:(window.pageHeight - 120 - 358)"
+          :height="window.pageHeight < 660 ? 200 : Math.floor((window.pageHeight - 200) / 2)"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
           highlight-current-row
@@ -90,7 +90,7 @@
               <span style="margin-top: 10px; padding: 5px; margin-left: 11.7%"
                 >项目类别</span
               >
-              <el-select
+              <!-- <el-select
                 v-model="values"
                 placeholder="请选择"
                 @change="ischangs"
@@ -104,7 +104,21 @@
                   :value="item.id"
                 >
                 </el-option>
-              </el-select>
+              </el-select> -->
+              <el-cascader
+                    v-model="values"
+                    :options="itemTypeId"
+                    ref="example"
+                   popper-class="example" 
+                    @change="ischangs"
+                    :props="{
+                      value: 'id',
+                      label: 'displayName',
+                      children: 'treeChildren',
+                      checkStrictly: true,
+                      expandTrigger: 'hover',
+                     }">
+                  </el-cascader>
               <span style="margin-left: 18.5%; padding: 5px">搜索选择</span>
               <el-select
                 value-key="id"
@@ -138,7 +152,7 @@
                 >
                   <div>{{ item.displayName }}</div>
                 </div> -->
-                <el-table :data="leftdata" :height="window.pageHeight < 668 ? 200:(window.pageHeight - 121 - 358)" @row-dblclick="dbClickChoosedAsb" border @selection-change="handleSelectionChange" @row-click="chooseAsbItem" highlight-current-row>
+                <el-table :data="leftdata" :height="window.pageHeight < 660 ? 200 : Math.floor((window.pageHeight - 270) / 2)" @row-dblclick="dbClickChoosedAsb" border @selection-change="handleSelectionChange" @row-click="chooseAsbItem" highlight-current-row>
                     <el-table-column type="index" align="center" label="序号"/>
                     <el-table-column prop="displayName" label="未选项目" />
                 </el-table>
@@ -188,7 +202,7 @@
                 >
                   <div>{{ item.displayName }}</div>
                 </div> -->
-                <el-table :data="rightdata" :height="window.pageHeight < 668 ? 200:(window.pageHeight - 121 - 358)" width="100%" @row-dblclick="removeAbs" border
+                <el-table :data="rightdata" :height="window.pageHeight < 660 ? 200 : Math.floor((window.pageHeight - 270) / 2)" width="100%" @row-dblclick="removeAbs" border
                     @selection-change="selecteditems" @row-click="removeAsbItem" highlight-current-row>
                     <el-table-column type="index" align="center" label="序号"/>
                     <el-table-column label="已选项目" prop="displayName" />
@@ -307,10 +321,15 @@
                   <el-cascader
                     v-model="form.itemTypeId"
                     :options="itemTypeId"
+                    popper-class="example"
+                    ref="itemTypeIds"
+                    @change="ischangsItemTypeId"
                     :props="{
                       value: 'id',
                       label: 'displayName',
-                      children: 'treeChildren'
+                      children: 'treeChildren',
+                      checkStrictly: true,
+                      expandTrigger: 'hover',
                      }">
                   </el-cascader>
                 </el-form-item>
@@ -569,7 +588,7 @@
         </el-row>
           </el-form>
           <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button @click="editcancellation">取 消</el-button>
             <el-button type="primary" @click="addoredit">确 定</el-button>
           </span>
     </el-dialog>
@@ -856,7 +875,7 @@ export default {
         isActive: "Y",
         isActiveBox:true,
         isBeforeEatBox:false,
-        isCheckBox:false,
+        isCheckBox:true,
         isContinueProcessBox:false,
         isDiagnosisFunctionBox:false,
         isItemResultMergerBox:false,
@@ -1240,10 +1259,13 @@ export default {
       getapi("/api/app/organization-units/by-code-all").then((res) => {
         this.organizationUnitdata = res.data;
       });
-      //获取组合项目 {isFilterActive:'Y'}
+      //获取组合项目
+      // getapi("/api/app/asbitem/in-filter").then((res) => {
+      //   this.asbitemdata = res.data.items;
+      // });
       postapi('/api/app/asbitem/getasbitemlist').then(res =>{
         this.asbitemdata = res.data
-      })     
+      })    
       //获取适用性别
       getapi("/api/app/for-sex").then((res) => {
         this.forsexdata = res.data;
@@ -1383,8 +1405,8 @@ export default {
           details:sdate
         }).then((res) => {
             if(res.code!=-1){
-              console.log("操作成功");
               this.isdislob = true;
+              this.$message.success("确定成功！");
             }
         })
       }
@@ -1533,11 +1555,19 @@ export default {
         this.projectid = res.data;
         this.initprojectid=[...res.data]
       });
-      groupsandlist(this.pages).then((res) => {
-        this.initTableData = [...res.data.items];
-        this.quckDepartment=res.data.items;
-        console.log(res);
+      postapi('/api/app/asbitem/getasbitemlist').then((res) => {
+        if(res.code != -1){
+          this.initTableData = res.data;
+          this.quckDepartment=[...res.data]
+        }        
       });
+      // groupsandlist(this.pages).then((res) => {
+      //   if(res.code!=-1){
+      //     this.initTableData = [...res.data.items];
+      //   this.quckDepartment=res.data.items;
+      //   initTableData
+      //   }
+      // });
     },
     //ary1 需要追加的数据  ary2目标数组
     updatedate() {
@@ -1555,16 +1585,23 @@ export default {
         }
       });
     },
+    ischangsItemTypeId(v){
+      this.$refs.itemTypeIds.toggleDropDownVisible();
+    },
     //项目类别选择
     ischangs(v) {
      if(v){
        if(this.curRow.id==undefined || this.curRow.id==""){
         this.$message.warning("请先选择组合项目")
        }else{
-        getapi(`/api/app/item/in-item-type/${v}`).then((res) => {
-          let bq=[]
+        this.$refs.example.toggleDropDownVisible();
+        let last = v.slice(-1)[0]
+        getapi(`/api/app/item/in-item-type/${last}`).then((res) => {
+          if(res.code!=-1){
+            let bq=[]
           bq = res.data.filter(item => !this.rightdata.some(ele=>ele.id === item.id));
           this.leftdata = [...bq];
+          }
         });
        }
      }else{
@@ -1682,13 +1719,14 @@ export default {
       if (this.form.id == undefined) {
         this.$message.warning("请点击选择操作的数据");
       } else {
-        this.dialogVisible = true;
         this.title = 2;
+        this.dialogVisible = true;
         if (this.$refs.ruleForm !== undefined){
           this.$refs.ruleForm.resetFields()
         } 
         asbitemgetid(this.form.id).then((res) => {
-          this.form=res.data
+          if(res.code!=-1){
+            this.form=res.data
           if (res.data.isItemResultMerger == 'Y') {
             this.form.isItemResultMergerBox = true;
           } else {
@@ -1724,6 +1762,7 @@ export default {
           } else {
             this.form.isActiveBox = false;
           }
+          }
         });
         //性别
         // examinationgender().then((res) => {
@@ -1748,6 +1787,10 @@ export default {
         });
       }
     },
+    editcancellation(){
+          this.dialogVisible = false
+          this.$refs.itemTypeIds.toggleDropDownVisible();
+    },
     //确定新增或者编辑
     addoredit() {
       this.$refs.ruleForm.validate((v) => {
@@ -1757,7 +1800,7 @@ export default {
               displayName: this.form.displayName,
               shortName: this.form.shortName,
               forSexId: this.form.forSexId,
-              itemTypeId: this.form.itemTypeId,
+              itemTypeId: this.form.itemTypeId.slice(-1)[0],
               price: Number(this.form.price),
               deviceTypeId: this.form.deviceTypeId,
               invoiceItemTypeId: this.form.invoiceItemTypeId,
@@ -1782,6 +1825,7 @@ export default {
                   this.$refs['tableData'].setCurrentRow(res.data);
                   this.rowick(res.data)
                 })
+                this.$refs.itemTypeIds.toggleDropDownVisible();
               }
             });
           } else if (this.title == 2) {
@@ -1789,7 +1833,7 @@ export default {
               displayName: this.form.displayName,
               shortName: this.form.shortName,
               forSexId: this.form.forSexId,
-              itemTypeId: this.form.itemTypeId,
+              itemTypeId: this.form.itemTypeId.slice(-1)[0],
               price: Number(this.form.price),
               deviceTypeId: this.form.deviceTypeId,
               invoiceItemTypeId: this.form.invoiceItemTypeId,
@@ -1815,6 +1859,7 @@ export default {
                 })
                 this.curRow={...res.data}
                 this.dialogVisible = false;
+                this.$refs.itemTypeIds.toggleDropDownVisible();
               }
             });
           }
@@ -1865,16 +1910,16 @@ export default {
     },
     rowick(row) {
       this.curRow={...row}
-      asbitemgetid(row.id).then((res) => {
-        this.curRow = { ...res.data };
-        this.form = res.data;
-      });
+      // asbitemgetid(row.id).then((res) => {
+      //   this.curRow = { ...res.data };
+      //   this.form = res.data;
+      // });
       this.values=row.itemTypeId
       getapi(
         `/api/app/asbitem-detail/asbitem-detail-in-item?AsbitemId=${row.id}`
       ).then((res) => {
         this.rightdata = [...res.data];
-        getapi(`/api/app/item/in-item-type/${row.itemTypeId}`).then((res) => {
+        getapi(`/api/app/item/in-item-type/${this.values}`).then((res) => {
           // this.leftdata = [...res.data];
           let bq=[]
           bq = res.data.filter(item => !this.rightdata.some(ele=>ele.id === item.id));
@@ -2003,3 +2048,21 @@ export default {
   margin-bottom: 0;
 }
 </style>
+<style>
+.example .el-cascader-panel .el-radio {
+    width: 100%;
+   	height: 100%;
+    z-index: 10;
+   	position: absolute;
+   	top: 0px;
+   	right: 0px; 			
+  }
+   
+ .example .el-cascader-panel .el-radio__input {
+    display: none;
+ }
+   
+ .example .el-cascader-panel .el-cascader-node__postfix {
+   		top: 10px; 			
+  }
+</style>
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index 2d2a622..87ed002 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -112,21 +112,18 @@
           </el-col>
          <el-col :span="6">
             <el-form-item label="项目类别" prop="itemTypeId">
-              <!-- <el-cascader
-                v-model="form.itemTypeId"
-                :options="itemTypeId"
-                :props="props"
-                :show-all-levels="false"
-              >
-              </el-cascader> -->
               <el-cascader
                 v-model="form.itemTypeId"
                 :options="itemTypeId"
+                popper-class="example"
+                ref="itemTypeId"
                 @change="onchange"
                 :props="{
                   value: 'id',
                   label: 'displayName',
-                  children: 'treeChildren'
+                  children: 'treeChildren',
+                  checkStrictly: true,
+                  expandTrigger: 'hover',
                 }"
               ></el-cascader>
               <!-- <el-select
@@ -578,12 +575,12 @@
           </el-col> -->
           <el-col :span="8">
             <el-form-item label="结果" prop="result">
-              <el-input v-model="rusetform.result" ref="ruseInput" @change="changeUpdate($event)"></el-input>
+              <el-input v-model="rusetform.result" ref="ruseInput" @change="changeUpdate($event)" @input="change($event)"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="诊断编号">
-              <el-select v-model="rusetform.diagnosisId" placeholder="请选择" filterable :filter-method="remoteMethod" default-first-option clearable @change="quckRusetform">
+              <el-select v-model="rusetform.diagnosisId" placeholder="请选择" filterable @change="quckRusetform">
                 <el-option
                   v-for="item in quickAsb"
                   :key="item.id"
@@ -596,12 +593,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="小结前加名称">
-              <el-checkbox v-model="rusetform.isNameIntoSummary" true-label="Y" false-label="N"/>
+              <el-checkbox v-model="rusetform.isNameIntoSummary" true-label="Y" false-label="N" @change="quckRusetform"/>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="结果进入小结">
-              <el-checkbox v-model="rusetform.isResultIntoSummary" true-label="Y" false-label="N" />
+              <el-checkbox v-model="rusetform.isResultIntoSummary" true-label="Y" false-label="N" @change="quckRusetform"/>
             </el-form-item>
           </el-col>
           <el-col :span="9">
@@ -610,6 +607,7 @@
                 v-model="rusetform.resultStatusId"
                 placeholder="请选择"
                 filterable
+                @change="quckRusetform"
               >
                 <el-option
                   v-for="item in resultStatusId"
@@ -1394,7 +1392,7 @@ export default {
               };
               postapi("/api/app/reference-range/text", obj).then((res) => {
                 if(res.code!=-1){
-                  console.log("新增成功");
+                  this.$message.success("新增成功");
                   this.fssubdex = "";
                   this.curRow.referenceRangeTypeFlag=this.referencerangevalue
                 }
@@ -1407,7 +1405,7 @@ export default {
               };
               putapi(`/api/app/reference-range/${this.fssubdexDete.id}/text`, obj).then((res) => {
                 if(res.code!=-1){
-                  console.log("修改成功");
+                  this.$message.success("修改成功");
                   this.fssubdex = "";
                   this.curRow.referenceRangeTypeFlag=this.referencerangevalue
                 }
@@ -1476,7 +1474,7 @@ export default {
            if(this.diagnostiele==1){
         postapi("/api/app/item-result-match", this.editdigoisceditingform).then((res) => {
         if(res.code!=-1){
-          console.log("添加成功");
+          this.$message.success("添加成功");
           this.diagnosticediting = false;
           this.putDiagnosis()
         }
@@ -1490,8 +1488,9 @@ export default {
           }
         ).then((res) => {
           if(res.code!=-1){
-            console.log("修改成功");
+            this.$message.success("修改成功");
             this.diagnosticediting = false;
+            this.curRowes=res.data
             this.putDiagnosis()
           }
         });
@@ -1500,9 +1499,10 @@ export default {
       });
     },
     diagnosick(row){
-      getapi(`/api/app/item-result-match/${row.id}`).then((res) => {
-        this.curRowes = res.data;
-      });
+      this.curRowes = row;
+      // getapi(`/api/app/item-result-match/${row.id}`).then((res) => {
+      //   this.curRowes = res.data;
+      // });
     },
     editDiagnosis(){
       this.editdigoisceditingform={ ...this.curRowes }
@@ -1531,7 +1531,7 @@ export default {
             deletapi(`/api/app/item-result-match/${this.editdigoisceditingform.id}`).then(
           (res) => {
             if(res.code!=-1){
-              console.log("删除成功");
+              this.$message.success("删除成功");
               Object.assign(this.$data.editdigoisceditingform, this.$options.data().editdigoisceditingform)
               this.curRowes={}
               this.putDiagnosis()
@@ -1613,7 +1613,7 @@ export default {
         putapi(
           `/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=2`
         ).then((res) => {
-          console.log("操作成功");
+          this.$message.success("操作成功");
           this.resultlist();
         });
       }
@@ -1626,7 +1626,7 @@ export default {
         putapi(
           `/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=1`
         ).then((res) => {
-          console.log("操作成功");
+          this.$message.success("操作成功");
           this.resultlist();
         });
       }
@@ -1646,7 +1646,7 @@ export default {
             deletapi(`/api/app/item-result-template/${this.rusetform.id}`).then(
           (res) => {
             if(res.code!=-1){
-              console.log("删除成功");
+              this.$message.success("删除成功");
               Object.assign(this.$data.rusetform, this.$options.data().rusetform)
               this.curRows={}
               this.resultlist();
@@ -1658,10 +1658,10 @@ export default {
       }
     },
     reustclick(row) {
-      // this.rusetform = row;
-      getapi(`/api/app/item-result-template/${row.id}`).then((res) => {
-        this.curRows = res.data;
-      });
+      this.curRows = row;
+      // getapi(`/api/app/item-result-template/${row.id}`).then((res) => {
+      //   this.curRows = res.data;
+      // });
     },
     //项目结果模板新增弹框
     resultediting() {
@@ -1687,7 +1687,7 @@ export default {
             }
             postapi(`/api/app/item-result-template`, this.rusetform).then((res) => {
               if(res.code!=-1){
-                console.log("新增成功");
+                this.$message.success("新增成功");
                 this.ruesttieledialogVisible = false;
                 this.resultlist();
               }
@@ -1701,8 +1701,9 @@ export default {
             this.rusetform
             ).then((res) => {
               if(res.code!=-1){
-                console.log("修改成功");
+                this.$message.success("修改成功");
                 this.ruesttieledialogVisible = false;
+                this.curRows={...res.data}
                 this.resultlist();
               }
             });
@@ -1788,9 +1789,10 @@ export default {
        this.rusetform.itemId = this.form.id;
     },
     quckRusetform(e){
-      if(!e){
-        this.remoteMethod()
-      }
+      // if(!e){
+      //   this.remoteMethod()
+      // }
+      this.$forceUpdate()
     },
     //获取项目类别列表
     getmedicalconclusionlist() {
@@ -1803,12 +1805,13 @@ export default {
       // this.form.customerOrgId = id;
       // console.log(id);
       // this.form.customerOrgId=this.form.customerOrgId[0]
-      if(this.form.itemTypeId){
-        this.form.itemTypeId.forEach((item) => {
-        // console.log(item);
-        this.form.itemTypeId = item;
-      });
-      }
+      // if(this.form.itemTypeId){
+      //   this.form.itemTypeId.forEach((item) => {
+      //   // console.log(item);
+      //   this.form.itemTypeId = item;
+      // });
+      // }
+      this.$refs.itemTypeId.toggleDropDownVisible();
     },
     gettypelist(listdata) {
       listdata.forEach((items) => {
@@ -2037,7 +2040,7 @@ export default {
       });
       projectdreog({ itemList: result }).then((res) => {
         if(res.code!=-1){
-          console.log("操作成功");
+          this.$message.success("操作成功");
           this.isshow = true;
         }
         // this.getlist();
@@ -2086,7 +2089,7 @@ export default {
       });
       putapi("/api/app/itemresulttemplate/updatesortmany",{ itemList: result }).then((res) => {
         if(res.code!=-1){
-          console.log("操作成功");
+          this.$message.success("操作成功");
           this.isshows = true;
         }
         // this.getlist();
@@ -2135,7 +2138,7 @@ export default {
           `/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=1`
         ).then((res) => {
           if(res.code!=-1){
-            console.log("操作成功");
+            this.$message.success("操作成功");
             this.resultlist();
           }
         });
@@ -2145,13 +2148,13 @@ export default {
     resulttoppings(){
       this.rusetform = { ...this.curRows };
       if (this.rusetform.id == undefined) {
-        console.log("请点击选择操作的数据");
+        this.$message.warning("请点击选择操作的数据");
       } else {
          putapi(
           `/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=2`
         ).then((res) => {
           if(res.code!=-1){
-            console.log("操作成功");
+            this.$message.success("操作成功");
             this.resultlist();
           }
         });
@@ -2171,7 +2174,7 @@ export default {
       });
       putapi("/api/app/itemresultmatch/updatesortmany",{ itemList: result }).then((res) => {
         if(res.code!=-1){
-          console.log("操作成功");
+          this.$message.success("操作成功");
           this.isshowes = true;
         }
         // this.getlist();
@@ -2214,7 +2217,7 @@ export default {
           `/api/app/itemresultmatch/updatesortmany?id=${this.editdigoisceditingform.id}&SortType=1`
         ).then((res) => {
           if(res.code!=-1){
-            console.log("操作成功");
+            this.$message.success("操作成功");
             this.resultlist();
           }
         });
@@ -2230,7 +2233,7 @@ export default {
           `/api/app/itemresultmatch/updatesortmany?id=${this.editdigoisceditingform.id}&SortType=2`
         ).then((res) => {
           if(res.code!=-1){
-            console.log("操作成功");
+            this.$message.success("操作成功");
             this.resultlist();
           }
         });
@@ -2246,11 +2249,11 @@ export default {
     toppings() {
       this.form = { ...this.curRow };
       if (this.form.id == undefined) {
-        console.log("请点击选择操作的数据");
+        this.$message.warning("请点击选择操作的数据");
       } else {
         projttitem(this.form.id, 2).then((res) => {
           if(res.code!=-1){
-            console.log("操作成功");
+            this.$message.success("操作成功");
             this.getItemTypeIdList();
           }
         });
@@ -2264,7 +2267,7 @@ export default {
       } else {
         projttitem(this.form.id, 1).then((res) => {
           if(res.code!=-1){
-            console.log("操作成功");
+            this.$message.success("操作成功");
             this.getItemTypeIdList();
           }
         });
@@ -2283,7 +2286,7 @@ export default {
         })
           .then(() => {
             projectdeleft(this.form.id).then((res) => {
-              console.log("删除成功");
+              this.$message.success("删除成功");
               this.getItemTypeIdList();
               Object.assign(this.$data.form, this.$options.data().form)
               this.curRow=this.$options.data().curRow
@@ -2294,16 +2297,17 @@ export default {
     },
     //点击列表通过id查询
     rowick(row) {
-      posjrctid(row.id).then((res) => {
-        this.curRow = { ...res.data };
-        // console.log(res);
-        // this.form = res.data;
-      });
+      this.curRow=row
+      // posjrctid(row.id).then((res) => {
+      //   this.curRow = { ...res.data };
+      // });
+    },
+    change(e){
+      this.$forceUpdate();
     },
     //编辑弹框
     editpopup() {
       this.form = { ...this.curRow };
-      console.log(this.form)
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -2392,9 +2396,10 @@ export default {
         if (v) {
           if (this.title == 1) {
             this.form.price = Number(this.form.price);
+            this.form.itemTypeId=this.form.itemTypeId.slice(-1)[0]
             addproject(this.form).then((res) => {
               if (res.code == 1) {
-                console.log("新增成功");
+                this.$message.success("新增成功");
                 this.getItemTypeIdList();
                 this.dialogVisible = false;
                 this.$nextTick(()=>{
@@ -2404,8 +2409,9 @@ export default {
               }
             });
           } else if (this.title == 2) {
+            this.form.itemTypeId=this.form.itemTypeId.slice(-1)[0]
             projectedit(this.form.id, this.form).then((res) => {
-              console.log("修改成功");
+              this.$message.success("修改成功");
               this.tableData.forEach((item,index)=>{
                 if(res.data.id==item.id){
                   this.$set(this.tableData,index,res.data)
@@ -2576,3 +2582,21 @@ export default {
   border-color: #fff !important;
 }
 </style>
+<style>
+.example .el-cascader-panel .el-radio {
+    width: 100%;
+   	height: 100%;
+    z-index: 10;
+   	position: absolute;
+   	top: 0px;
+   	right: 0px; 			
+  }
+   
+ .example .el-cascader-panel .el-radio__input {
+    display: none;
+ }
+   
+ .example .el-cascader-panel .el-cascader-node__postfix {
+   		top: 10px; 			
+  }
+</style>