From 70e4d2c33cc2e3af590d1816c0c703da341538cf Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 04 九月 2026 14:13:32 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/QuestionnaireTask.vue |   44 ++++++++++++++++++++++++--------------------
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 43ed363..b81f5a9 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -379,7 +379,7 @@
                       </div>
                       <el-tag
                         v-for="tag in diagglist"
-                        @close="removediagg(tag.icd10code)"
+                        @close="removediagg(tag)"
                         type="warning"
                         closable
                         :disable-transitions="false"
@@ -713,7 +713,7 @@
                         </div>
                         <el-tag
                           v-for="tag in diagglist"
-                          @close="removediagg(tag.icd10code)"
+                          @close="removediagg(tag)"
                           type="warning"
                           closable
                           :disable-transitions="false"
@@ -1745,6 +1745,7 @@
         this.form.serviceType == 8 ||
         this.form.serviceType == 12 ||
         this.form.serviceType == 13 ||
+        this.form.serviceType == 20 ||
         this.form.serviceType == 9
       ) {
         this.checkboxlist = [
@@ -2170,7 +2171,7 @@
                 ...item,
                 itemCode: code,
                 itemName: item.itemName || item.medicalName,
-                manufacturerName: item.manufacturerName || item.medicalCompany
+                manufacturerName: item.manufacturerName || item.medicalCompany,
               });
             });
           }
@@ -2183,7 +2184,7 @@
                 item.icdname = item.icd10name;
                 this.diagglist.push(item);
               } else {
-                getillnesslist({ icdname: item.icd10name }).then((res) => {
+                getillnesslist({ icdcode: item.icd10code }).then((res) => {
                   item.icdname = res.rows[0].icdname;
                   this.diagglist.push(item);
                 });
@@ -2234,25 +2235,26 @@
         });
       }
     },
-    removediagg(row) {
+    removediagg(tag) {
       // 浠诲姟缁勶細鏈湴鍒犻櫎鍗冲彲锛屽悗绔繚瀛樻椂缁熶竴鏇存柊
       if (this.form.appltype == 5) {
-        this.diagglist = this.diagglist.filter((item) => item.icd10code != row);
+        this.diagglist = this.diagglist.filter((item) => item != tag);
         return;
       }
-      // 鏅�氱柧鐥呭叧鑱旓細璋冨悗绔帴鍙ｉ�愭潯鍒犻櫎
-      let result = this.diagglist
-        .filter((item) => item.icd10code == row)
-        .map((item) => item.id);
-      if (result.length) {
-        taskdiaghospgetsondel(result).then((res) => {
+
+      // 鏅�氱柧鐥呭叧鑱旓細鍒ゆ柇鏄惁鏈� id锛堝凡淇濆瓨鐨勮褰曟墠鏈� id锛�
+      if (tag.id) {
+        // id 瀛樺湪锛岃皟鍚庣鎺ュ彛鍒犻櫎
+        taskdiaghospgetsondel([tag.id]).then((res) => {
           if (res.code) {
-            this.diagglist = this.diagglist.filter(
-              (item) => item.icd10code != row
-            );
+            this.diagglist = this.diagglist.filter((item) => item != tag);
             this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
           }
         });
+      } else {
+        // id 涓嶅瓨鍦紙鏈繚瀛樼殑鏂拌褰曪級锛岀洿鎺ユ湰鍦板垹闄�
+        this.diagglist = this.diagglist.filter((item) => item != tag);
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       }
     },
     remoteopcode(name) {
@@ -2272,12 +2274,14 @@
     },
     // 鍒犻櫎宸查�夎嵂鍝侊紙鍗曠嫭鎺ュ彛锛�
     removeMedical(code) {
-      taskmedicaldel({ medicalCode: code, taskId: this.form.taskid }).then((res) => {
-        if (res.code == 200) {
-          this.medicalCodes = this.medicalCodes.filter((c) => c !== code);
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      taskmedicaldel({ medicalCode: code, taskId: this.form.taskid }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.medicalCodes = this.medicalCodes.filter((c) => c !== code);
+            this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          }
         }
-      });
+      );
     },
 
     // ---------- 鎮ｈ�呴�夋嫨 ----------

--
Gitblit v1.9.3