From b7092c2bf77696eb13fd680cb006211c17b48f5c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 15 五月 2025 18:00:15 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/patient/hospital.vue       |   29 ++++++++------
 src/views/patient/patient/behospitalized.vue |   33 ++++++++--------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index d7700f7..2c11d65 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -47,7 +47,7 @@
           <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
             <el-cascader
               v-model="queryParams.scopetype"
-              placeholder="榛樿鍏ㄩ儴"
+              placeholder="榛樿鍏ㄩ儴绉戝"
               :options="sourcetype"
               :props="{ expandTrigger: 'hover' }"
               @change="handleChange"
@@ -501,7 +501,11 @@
         },
         {
           value: 3,
-          label: "鍏ㄩ儴",
+          label: "鍏ㄩ儴绉戝",
+        },
+        {
+          value: 4,
+          label: "鍏ㄩ儴鐥呭尯",
         },
       ],
       // 琛ㄥ崟鍙傛暟
@@ -633,9 +637,6 @@
     this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
       (obj) => obj.deptCode
     );
-    this.queryParams.leavehospitaldistrictcodes = store.getters.belongWards.map(
-      (obj) => obj.districtCode
-    );
     this.getList();
     this.listDept();
     this.gettabList();
@@ -644,13 +645,6 @@
     /** 鏌ヨ鎮ｈ�呭垪琛� */
     getList() {
       this.loading = true;
-      if (this.queryParams.searchscope == 3) {
-        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.queryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-      }
       listpatient(this.queryParams).then((response) => {
         console.log(response);
         this.userList = response.rows;
@@ -675,12 +669,17 @@
         this.queryParams.leaveldeptcodes.push(code);
         this.queryParams.leavehospitaldistrictcodes = [];
         this.queryParams.searchscope = 1;
-      } else if (type == 2) {
-        this.queryParams.leavehospitaldistrictcodes.push(code);
-        this.queryParams.leaveldeptcodes = [];
-        this.queryParams.searchscope = 2;
-      } else {
+      } else if (type == 3) {
+        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
         this.queryParams.searchscope = 3;
+        this.queryParams.leavehospitaldistrictcodes = [];
+      } else if (type == 4) {
+        this.queryParams.leaveldeptcodes = [];
+        this.queryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+        this.queryParams.searchscope = 4;
       }
     },
     /** 鏌ヨ鏍囩鍒楄〃 */
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 80ce156..e402ca4 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -49,7 +49,7 @@
           <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
             <el-cascader
               v-model="queryParams.scopetype"
-              placeholder="榛樿鍏ㄩ儴"
+              placeholder="榛樿鍏ㄩ儴绉戝"
               :options="sourcetype"
               :props="{ expandTrigger: 'hover' }"
               @change="handleChange"
@@ -533,7 +533,11 @@
         },
         {
           value: 3,
-          label: "鍏ㄩ儴",
+          label: "鍏ㄩ儴绉戝",
+        },
+        {
+          value: 4,
+          label: "鍏ㄩ儴鐥呭尯",
         },
       ],
       //瀵煎叆杩涘害
@@ -610,9 +614,6 @@
     this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
       (obj) => obj.deptCode
     );
-    this.queryParams.leavehospitaldistrictcodes = store.getters.belongWards.map(
-      (obj) => obj.districtCode
-    );
     this.getList();
     this.listDept();
     this.gettabList();
@@ -620,13 +621,6 @@
   methods: {
     /** 鏌ヨ鎮ｈ�呭垪琛� */
     getList() {
-      if (this.queryParams.searchscope == 3) {
-        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.queryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-      }
       this.loading = true;
       listpatient(this.queryParams).then((response) => {
         console.log(response);
@@ -686,8 +680,17 @@
         this.queryParams.leavehospitaldistrictcodes.push(code);
         this.queryParams.leaveldeptcodes = [];
         this.queryParams.searchscope = 2;
-      } else {
+      } else if (type == 3) {
+        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
         this.queryParams.searchscope = 3;
+        this.queryParams.leavehospitaldistrictcodes = [];
+      } else if (type == 4) {
+        this.queryParams.leaveldeptcodes = [];
+        this.queryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+        this.queryParams.searchscope = 4;
       }
     },
     // 鏌ヨ瀵煎叆灞曠ず鍒楄〃

--
Gitblit v1.9.3