From b9ff6dd12a376082f1e010b1f31362032a44d999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Tue, 24 Oct 2023 10:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E8=80=83=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 src/components/itemSet/ReferenceRange.vue |  12 +-
 src/views/fee-settings/Diagnosis.vue      |  17 +-
 src/views/fee-settings/Item.vue           | 238 +++++++++++++---------
 3 files changed, 152 insertions(+), 115 deletions(-)
diff --git a/src/components/itemSet/ReferenceRange.vue b/src/components/itemSet/ReferenceRange.vue
index e85b4fe..3dd937b 100644
--- a/src/components/itemSet/ReferenceRange.vue
+++ b/src/components/itemSet/ReferenceRange.vue
@@ -65,13 +65,13 @@
     
     
 
@@ -221,9 +221,7 @@ export default {
   created() {},
 
   mounted() {
-    //console.log('@子节点', this.itemId, this.ReferenceRangeTypeFlag)
     this.addtoedit();
-
     this.getlist(this.itemId, this.ReferenceRangeTypeFlag);
   },
   computed: {
@@ -390,7 +388,6 @@ export default {
             let before=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/(\S*)-/)[1])
             let after=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/-(\S*)/)[1])
             if(before && after){
-              console.log(that.form)
               if(that.form.criticalRangeValue!="" && that.form.criticalRangeValue!=undefined){
                 if(that.form.criticalRangeValue.includes('-')){
                   let criticalBefore=/^\d+\.?\d?$/.test(that.form.criticalRangeValue.match(/(\S*)-/)[1])
@@ -441,4 +438,7 @@ export default {
 :deep .editButton .el-button{
   width: 100%;
 }
+:deep .el-form-item {
+    margin-bottom: 14px;
+}
 
diff --git a/src/views/fee-settings/Diagnosis.vue b/src/views/fee-settings/Diagnosis.vue
index 8b29c81..caf15e2 100644
--- a/src/views/fee-settings/Diagnosis.vue
+++ b/src/views/fee-settings/Diagnosis.vue
@@ -1,7 +1,7 @@
 
   
     
-      
+      
         诊断
         
           
@@ -11,13 +11,14 @@
               @node-click="handleNodeClick"
             >
           
-          
+          
             
               
@@ -331,12 +332,6 @@ export default {
           { required: true, message: "请选择诊断级别", trigger: "blur" },
         ],
       },
-      pages: {
-        Filter: "",
-        SkipCount: 0,
-        MaxResultCount: 100,
-        Sorting: "displayOrder desc",
-      },
       tableData: [],
       initTableData: [],
       dialogVisible: false,
@@ -717,9 +712,9 @@ export default {
       console.log(row);
     },
     getlist() {
-      postapi("/api/app/diagnosis/getlistinfilter", this.pages).then((res) => {
-        this.initTableData = [...res.data.items];
-        this.tableData = res.data.items;
+      postapi("/api/app/diagnosis/getlistinsuggestion").then((res) => {
+        this.initTableData = [...res.data];
+        this.tableData = res.data;
         console.log(res);
       });
     },
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index e2080a8..f7aa875 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -1,30 +1,15 @@
 
   
-    
+    
       
         项目设置
-        
-          
-            
-            
+        
+          
+            
+              
                 
                 
               
-          
-        
-        
-          
-          
+          
             
     
     
-    
+    
       新增
       
         编辑
       
-      
+      
         删除
       
-      
+      
         置顶
       
-      
+      
         置底
       
-      
+      
         排序
       
-      
+      
         取消
       
-      
+      
         结果模板
       
-      
+      
         参考范围
       
@@ -494,12 +475,12 @@
           
         
 
         
-          
添加
+          
添加
           
-            编辑
+            编辑
           
           
-            删除
+            删除
           
           
           
-            诊断匹配诊断匹配
           
         
@@ -544,7 +525,7 @@
            -->
           
             
-              
+              
             
           
           
@@ -625,7 +606,7 @@
       
+      >无参考范围
       
       
         
@@ -633,7 +614,7 @@
       
       
         
         
-          
增加
+          
增加
           
-            编辑
+            编辑
           
           
-            删除
+            删除
           
          
        
@@ -751,7 +732,7 @@
         
           
             
-              
+              
             
           
           
@@ -1246,6 +1227,7 @@ export default {
       diagnostiele:1,
       curRows:{},
       curRowes:{},
+      fssubdexDete:""
     };
   },
   created() {
@@ -1269,35 +1251,58 @@ export default {
         this.disableddiagnosisFunction = false;
       }
     },
-    addfssubdex(){
-      if(this.fssubdex){
-        let obj = {
-          itemId: this.form.id,
-          referenceRangeValue: this.fssubdex,
-          referenceRangeTypeFlag: this.referencerangevalue,
-        };
-        postapi("/api/app/reference-range/text", obj).then((res) => {
-          if(res.code!=-1){
-            this.$message.success("新增成功");
-            this.fssubdex = "";
+    // addfssubdex(){
+    //   if(this.fssubdex){
+    //     let obj = {
+    //       itemId: this.form.id,
+    //       referenceRangeValue: this.fssubdex,
+    //       referenceRangeTypeFlag: this.referencerangevalue,
+    //     };
+    //     postapi("/api/app/reference-range/text", obj).then((res) => {
+    //       if(res.code!=-1){
+    //         this.$message.success("新增成功");
+    //         this.fssubdex = "";
+    //       }
+    //     });
+    //   }else{
+    //     this.$message.warning("内容不能为空");
+    //   }
+    // },
+    //参考范围确定类型
+    determinetype() {
+      this.referencerangedialogVisible = false;
+      if(this.referencerangevalue == 2){
+        if(this.fssubdex){
+          if(!this.fssubdexDete){
+             let obj = {
+               itemId: this.form.id,
+               referenceRangeValue: this.fssubdex,
+               referenceRangeTypeFlag: this.referencerangevalue,
+              };
+              postapi("/api/app/reference-range/text", obj).then((res) => {
+                if(res.code!=-1){
+                  this.$message.success("新增成功");
+                  this.fssubdex = "";
+                }
+              });
+          }else{
+             let obj = {
+               itemId: this.form.id,
+               referenceRangeValue: this.fssubdex,
+               referenceRangeTypeFlag: this.referencerangevalue,
+              };
+              putapi(`/api/app/reference-range/${this.fssubdexDete.id}/text`, obj).then((res) => {
+                if(res.code!=-1){
+                  this.$message.success("修改成功");
+                  this.fssubdex = "";
+                }
+              });
           }
-        });
       }else{
         this.$message.warning("内容不能为空");
       }
-    },
-    //参考范围确定类型
-    determinetype() {
-      this.referencerangedialogVisible = false;
-      // if(this.referencerangevalue == 0){
-      //   this.referencerangedialogVisible = false;
-      // }else if(this.referencerangevalue == 1){
-      //   this.referencerangedialogVisible = false;
-      // }else if (this.referencerangevalue == 2) {
-       
-      // }else if(this.referencerangevalue == 3){
-      //   this.referencerangedialogVisible = false;
-      // }
+      }
+      this.curRow.referenceRangeTypeFlag=this.referencerangevalue
       this.referencerangevalue="0"
     },
     async blurInput(id, name, value) {
@@ -1448,7 +1453,12 @@ export default {
       }
     },
     changeUpdate(e){
-      this.$forceUpdate()
+      this.$delete(this.rusetform,'result')
+      this.$set(this.rusetform,'result',e)
+    },
+    changeUpdates(e){
+      this.$delete(this.editdigoisceditingform,'result')
+      this.$set(this.editdigoisceditingform,'result',e)
     },
     //结果模板添加
     resultaddition() {},
@@ -1585,16 +1595,18 @@ export default {
     //参考范围下拉选择
     selecttype(v) {
       this.referencerangevalue = v;
-      // if (v == 1) {
-      //   getapi("/api/app/sex").then((res) => {
-      //     console.log(res);
-      //     this.sexid = res.data;
-      //   });
-      //   postapi("/api/app/diagnosis/getlistinsuggestion").then((res) => {
-      //     this.scopediagnostic = res.data.items;
-      //     console.log(res);
-      //   });
-      // }
+      if(v=="2"){
+        getapi(`/api/app/reference-range/in-type/${this.form.id}?ReferenceRangeTypeFlag=${this.referencerangevalue}`).then((res) => {
+            if(res.code!=-1){
+            if(res.data[0]){
+              this.fssubdex=res.data[0].referenceRangeValue
+            }else{
+              this.fssubdex=""
+            }
+            this.fssubdexDete=res.data[0]
+            }
+          });
+      }
     },
     //参考范围
     referencerange() {
@@ -1602,7 +1614,20 @@ export default {
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
+        this.referencerangevalue=this.form.referenceRangeTypeFlag
         this.referencerangedialogVisible = true;
+        if(this.referencerangevalue=="2"){
+          getapi(`/api/app/reference-range/in-type/${this.form.id}?ReferenceRangeTypeFlag=${this.form.referenceRangeTypeFlag}`).then((res) => {
+            if(res.code!=-1){
+            if(res.data[0]){
+              this.fssubdex=res.data[0].referenceRangeValue
+            }else{
+              this.fssubdex=""
+            }
+            this.fssubdexDete=res.data[0]
+            }
+          });
+        }
       }
     },
     //结果模板添加或者修改需要的列
@@ -2055,7 +2080,12 @@ export default {
           } else if (this.title == 2) {
             projectedit(this.form.id, this.form).then((res) => {
               this.$message.success("修改成功");
-              this.getlist();
+              this.tableData.forEach((item,index)=>{
+                if(res.data.id==item.id){
+                  this.$set(this.tableData,index,res.data)
+                }
+              })
+              this.curRow={...res.data}
               this.dialogVisible = false;
             });
           }
@@ -2093,10 +2123,10 @@ export default {
     //新增或者编辑弹框需要的下拉框接口数据
     addorgropdata() {
       //获取项目id
-      projectlist().then((res) => {
-        this.itemTypeId = res.data;
-        this.tcdate(this.itemTypeId);
-      });
+      // projectlist().then((res) => {
+      //   this.itemTypeId = res.data;
+      //   this.tcdate(this.itemTypeId);
+      // });
       //获取单位
       unitlist().then((res) => {
         this.unitId = res.data.items;
@@ -2106,9 +2136,9 @@ export default {
         this.priceItemId = res.data.items;
       });
       //参考范围
-      getapi("/api/app/reference-range").then((res) => {
-        this.reference = res.data.items;
-      });
+      // getapi("/api/app/reference-range").then((res) => {
+      //   this.reference = res.data.items;
+      // });
       //结果模板
       getapi("/api/app/item-result-template").then((res) => {
         this.resulttemp = res.data.items;
@@ -2137,6 +2167,17 @@ export default {
 };