From 6aeeded93683bc51c5582d869eb319b53d5ea894 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Wed, 12 Jul 2023 08:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doctorCheck/PatientRegisterBase.vue       |  2 +-
 .../unitGrouping/unitGroupCategory.vue        | 35 ++++++++++---------
 .../unitGrouping/unitGroupingTable.vue        | 20 ++++++-----
 src/views/fee-settings/Asbitem.vue            |  9 ++---
 src/views/fee-settings/Diagnosis.vue          |  4 +--
 src/views/fee-settings/DiagnosisTemplate.vue  | 12 +++----
 src/views/fee-settings/MedicalPackage.vue     | 13 +++----
 7 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index d6a8ba0..ac62551 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex">
-    <div style="display: flex; flex-wrap: wrap; width: 100%">      
+    <div style="display: flex; flex-wrap: wrap; width: 100%;">      
       <div class="query">
         <span>条码号</span>
         <el-input placeholder="条码号" v-model="doctorCheck.prBase.patientRegisterNo" size="small" style="width: 140px" 
diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue
index 0ffbd70..00961ca 100644
--- a/src/components/unitGrouping/unitGroupCategory.vue
+++ b/src/components/unitGrouping/unitGroupCategory.vue
@@ -227,7 +227,7 @@ export default {
             // this.tabledata.push(this.rightselctedata[i]);
           }
           console.log(this.personnelUnit.customerOrgGroupId);
-        
+
           // this.
           this.rightselctedata.forEach((item) => {
             this.addrulst.push({
@@ -253,9 +253,9 @@ export default {
       } else {
         if (this.unselecteddata.length == 0) {
           this.$message.warning("未选数据为空无法移动");
-        } else {       
+        } else {
           this.saveornot = false;
-          let count = this.unselecteddata.length - 1;          
+          let count = this.unselecteddata.length - 1;
           for (var i = count; i >= 0; i--) {
             // this.tabledata.splice(i, 1);
             if ([...new Set(this.unselecteddata)]) {
@@ -273,23 +273,22 @@ export default {
             // } else {
             //   price = this.price;
             // }
-              //获取最新价格        
+            //获取最新价格
           });
-           let prices = "";
+          //  let prices = "";
           this.personnelUnit.nogroupselected.forEach((items) => {
-            prices = items.price;
-            console.log(prices);
+            // prices = items.price;
+
             // this.price = item.price;
-            console.log(price);
+            console.log(items, "items");
             this.addrulst.push({
-              asbitemId: "3a0b2f0c-f884-bec4-a350-79b46b455a2d",
+              asbitemId:items.id,  // "3a0b2f0c-f884-bec4-a350-79b46b455a2d"
               // price: prices,
-              price: this.psrice,
+              price: items.price,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
           });
           console.log(this.addrulst, "hhhhhhh");
-       
         }
       }
     },
@@ -355,12 +354,12 @@ export default {
         this.personnelUnit.form = res.data;
         console.log(res);
       });
-      getapi(
-        `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.form.id}`
-      ).then((res) => {
-        console.log(res, "res");
-        this.personnelUnit.nogroupselected = res.data;
-      });
+      // getapi(
+      //   `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${this.personnelUnit.form.id}`
+      // ).then((res) => {
+      //   console.log(res, "res");
+      //   this.personnelUnit.nogroupselected = res.data;
+      // });
     },
     // getapi(`/api/app/customer-org-group/${row.id}`).then((res)
   },
@@ -401,6 +400,8 @@ export default {
   width: 20%;
   border: 1px solid #000;
   height: 300px;
+  overflow: hidden;
+ 
   margin-left: 7%;
 }
 .examinationcategory {
diff --git a/src/components/unitGrouping/unitGroupingTable.vue b/src/components/unitGrouping/unitGroupingTable.vue
index 9387c16..68a2530 100644
--- a/src/components/unitGrouping/unitGroupingTable.vue
+++ b/src/components/unitGrouping/unitGroupingTable.vue
@@ -271,19 +271,21 @@ export default {
     },
     //点击当前列
     clickoncolumn(row) {
+      console.log(row.id);
       this.personnelUnit.customerOrgGroupId = row.id;
       getapi(`/api/app/customer-org-group/${row.id}`).then((res) => {
         this.form = res.data;
         this.personnelUnit.form = res.data;
       });
-      // //
-      // getapi(
-      //   `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.form.id}`
-      // ).then((res) => {
-      //   console.log(res.data, "当前列");
-      //   this.personnelUnit.nogroupselected = res.data;
-      //   console.log(this.personnelUnit.nogroupselected, "我是分组");
-      // });
+      // // 
+      console.log(this.personnelUnit.form.id);
+      getapi(
+        `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${this.personnelUnit.form.id}`
+      ).then((res) => {
+        console.log(res.data, "当前列");
+        this.personnelUnit.nogroupselected = res.data;
+        console.log(this.personnelUnit.nogroupselected, "我是分组");
+      });
     },
     //编辑弹框
     editgroup() {
@@ -291,7 +293,7 @@ export default {
       this.obtainsuperior();
       this.dialogVisible = true;
     },
-    //获取性别和婚姻状况
+    //获取性别和婚姻状况 
     obtainsuperior() {
       //获取性别
       getapi("/api/app/sex").then((res) => {
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 51f41b6..7c6262c 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -710,10 +710,11 @@ export default {
       this.num = index;
       console.log(this.num);
     },
-    //获取项目类别 3a0b0b10-719f-5824-6956-8cb70f204013
+    //获取项目类别 3a0b0b10-719f-5824-6956-8cb70f204013 /api/app/item-type/by-code-all
     gitprojectcategory() {
-      getapi("/api/app/item-type").then((res) => {
-        this.projectid = res.data.items;
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        this.projectid = res.data;
+        console.log('res项目类别',res);
       });
     },
     //ary1 需要追加的数据  ary2目标数组
@@ -735,7 +736,7 @@ export default {
     //项目类别选择
     ischangs(v) {
       console.log(v);
-      //`/api/app/diagnosis/in-item-type/${v}`
+      //`/api/app/diagnosis/in-item-type/${v}`3a0c50b9-9621-61b7-fc93-1cfab1ec0478
       getapi(`/api/app/asbitem/in-item-type/${v}`).then((res) => {
         console.log(res);
         this.leftdata = res.data;
diff --git a/src/views/fee-settings/Diagnosis.vue b/src/views/fee-settings/Diagnosis.vue
index 4602b57..a2599ee 100644
--- a/src/views/fee-settings/Diagnosis.vue
+++ b/src/views/fee-settings/Diagnosis.vue
@@ -426,8 +426,8 @@ export default {
     },
     //获取项目类别 3a0b0b10-719f-5824-6956-8cb70f204013
     gitprojectcategory() {
-      getapi("/api/app/item-type").then((res) => {
-        this.projectid = res.data.items;
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        this.projectid = res.data;
       });
     },
     //ary1 需要追加的数据  ary2目标数组
diff --git a/src/views/fee-settings/DiagnosisTemplate.vue b/src/views/fee-settings/DiagnosisTemplate.vue
index 633e1e6..e45b4bd 100644
--- a/src/views/fee-settings/DiagnosisTemplate.vue
+++ b/src/views/fee-settings/DiagnosisTemplate.vue
@@ -289,10 +289,10 @@ export default {
         let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
         sdate.push(sss);
       });
-      this.leftdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
-        sdate.push(sss);
-      });
+      // this.leftdata.forEach((element) => {
+      //   let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
+      //   sdate.push(sss);
+      // });
       console.log(sdate);
       if (sampleGroupId == undefined) {
         this.$message.warning("请选择列表");
@@ -355,8 +355,8 @@ export default {
     },
     //获取项目类别 3a0b0b10-719f-5824-6956-8cb70f204013
     gitprojectcategory() {
-      getapi("/api/app/item-type").then((res) => {
-        this.projectid = res.data.items;
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        this.projectid = res.data;
       });
     },
     //ary1 需要追加的数据  ary2目标数组
diff --git a/src/views/fee-settings/MedicalPackage.vue b/src/views/fee-settings/MedicalPackage.vue
index 4cc632f..3b45ca6 100644
--- a/src/views/fee-settings/MedicalPackage.vue
+++ b/src/views/fee-settings/MedicalPackage.vue
@@ -380,12 +380,13 @@ export default {
       let sdate = [];
       this.rightdata.forEach((element) => {
         let sss = { medicalPackageId: sampleGroupId, asbitemId: element.id };
+        console.log(sss);
         sdate.push(sss);
       });
-      this.leftdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
-        sdate.push(sss);
-      });
+      // this.leftdata.forEach((element) => {
+      //   let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
+      //   sdate.push(sss);
+      // });
       console.log(sdate);
       if (sampleGroupId == undefined) {
         this.$message.warning("请选择列表");
@@ -476,8 +477,8 @@ export default {
     },
     //获取项目类别 3a0b0b10-719f-5824-6956-8cb70f204013
     gitprojectcategory() {
-      getapi("/api/app/item-type").then((res) => {
-        this.projectid = res.data.items;
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        this.projectid = res.data;
       });
     },
     //项目类别选择