From c7c591d6b52274c7d324dfccee5686632c153f6f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 02 七月 2025 14:58:36 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/technology/index.vue            |   12 ++--
 src/views/followvisit/SpecificDisease/index.vue       |   10 +-
 src/views/followvisit/again/index.vue                 |   12 ++--
 src/views/followvisit/zbAgain/index.vue               |   12 ++--
 src/views/patient/shadow/index.vue                    |   10 +-
 src/views/followvisit/discharge/outpatientService.vue |   12 ++--
 src/views/patient/questionnaire/index.vue             |   10 +-
 src/views/followvisit/record/index.vue                |   12 ++--
 src/views/followvisit/discharge/index.vue             |   12 ++--
 src/views/patient/propaganda/QuestionnaireTask.vue    |   41 ++++++++-----
 10 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/src/views/followvisit/SpecificDisease/index.vue b/src/views/followvisit/SpecificDisease/index.vue
index feb2e2b..424d6a5 100644
--- a/src/views/followvisit/SpecificDisease/index.vue
+++ b/src/views/followvisit/SpecificDisease/index.vue
@@ -842,10 +842,10 @@
           name: "寰呭彂閫�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "宸插彂閫佹湭棰嗗彇",
@@ -986,7 +986,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/followvisit/again/index.vue b/src/views/followvisit/again/index.vue
index ba0cee9..082669a 100644
--- a/src/views/followvisit/again/index.vue
+++ b/src/views/followvisit/again/index.vue
@@ -929,10 +929,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -1157,7 +1157,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1237,7 +1237,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[3].value = response.rows[0].fssb;
           this.cardlist[4].value = response.rows[0].dsf;
-          this.cardlist[5].value = response.rows[0].yfs2;
+          // this.cardlist[5].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 001e5a1..93625d1 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -1124,10 +1124,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -1348,7 +1348,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1424,7 +1424,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[3].value = response.rows[0].fssb;
           this.cardlist[4].value = response.rows[0].dsf;
-          this.cardlist[5].value = response.rows[0].yfs2;
+          // this.cardlist[5].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/followvisit/discharge/outpatientService.vue b/src/views/followvisit/discharge/outpatientService.vue
index b61c695..0601da8 100644
--- a/src/views/followvisit/discharge/outpatientService.vue
+++ b/src/views/followvisit/discharge/outpatientService.vue
@@ -928,10 +928,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -1151,7 +1151,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1227,7 +1227,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[3].value = response.rows[0].fssb;
           this.cardlist[4].value = response.rows[0].dsf;
-          this.cardlist[5].value = response.rows[0].yfs2;
+          // this.cardlist[5].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 1063d26..6192c55 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -879,10 +879,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -1049,7 +1049,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1127,7 +1127,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[3].value = response.rows[0].fssb;
           this.cardlist[4].value = response.rows[0].dsf;
-          this.cardlist[5].value = response.rows[0].yfs2;
+          // this.cardlist[5].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/followvisit/technology/index.vue b/src/views/followvisit/technology/index.vue
index 5697c8b..dde2ab3 100644
--- a/src/views/followvisit/technology/index.vue
+++ b/src/views/followvisit/technology/index.vue
@@ -823,10 +823,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -999,7 +999,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1061,7 +1061,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[3].value = response.rows[0].fssb;
           this.cardlist[4].value = response.rows[0].dsf;
-          this.cardlist[5].value = response.rows[0].yfs2;
+          // this.cardlist[5].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/followvisit/zbAgain/index.vue b/src/views/followvisit/zbAgain/index.vue
index 624a23d..e53487e 100644
--- a/src/views/followvisit/zbAgain/index.vue
+++ b/src/views/followvisit/zbAgain/index.vue
@@ -929,10 +929,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -1157,7 +1157,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
@@ -1237,7 +1237,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[3].value = response.rows[0].fssb;
           this.cardlist[4].value = response.rows[0].dsf;
-          this.cardlist[5].value = response.rows[0].yfs2;
+          // this.cardlist[5].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index e24eaa0..2548a55 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -1686,9 +1686,7 @@
       this.overallCase.forEach((item) => {
         this.allpids.push(item.patid);
       });
-      if (
-        this.patientqueryParams.allhosp == 4
-      ) {
+      if (this.patientqueryParams.allhosp == 4) {
         this.tableLabelhz = [
           // { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
           { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
@@ -1725,21 +1723,16 @@
       }
       // 鏉ユ簮鍒ゆ柇
 
-      if (this.patientqueryParams.searchscope == 1) {
-        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
+      if (this.patientqueryParams.allhosp == 4) {
+        this.patientqueryParams.hospitaldistrictcodes = [];
+        this.patientqueryParams.deptcodes = [];
+      } else if (this.patientqueryParams.allhosp == 1) {
+        this.patientqueryParams.deptcodes =
+          this.patientqueryParams.leaveldeptcodes;
+        this.patientqueryParams.hospitaldistrictcodes =
+          this.patientqueryParams.leavehospitaldistrictcodes;
         this.patientqueryParams.leavehospitaldistrictcodes = [];
-      } else if (this.patientqueryParams.searchscope == 2) {
-        this.patientqueryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
         this.patientqueryParams.leaveldeptcodes = [];
-      } else {
-        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.patientqueryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
       }
       getTaskpatientQC(this.patientqueryParams).then((response) => {
         this.patientuserList = response.rows;
@@ -1833,6 +1826,22 @@
 
         return;
       }
+      if (this.patientqueryParams.searchscope == 1) {
+        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.patientqueryParams.leavehospitaldistrictcodes = [];
+      } else if (this.patientqueryParams.searchscope == 2) {
+        this.patientqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+        this.patientqueryParams.leaveldeptcodes = [];
+      } else {
+        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.patientqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
       if (
         !this.patientqueryParams.leavehospitaldistrictcodes ||
         !this.patientqueryParams.leavehospitaldistrictcodes[0]
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 70f303d..a4b9ba5 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -739,10 +739,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -883,7 +883,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;
diff --git a/src/views/patient/shadow/index.vue b/src/views/patient/shadow/index.vue
index de47fc8..6a6fbba 100644
--- a/src/views/patient/shadow/index.vue
+++ b/src/views/patient/shadow/index.vue
@@ -739,10 +739,10 @@
           name: "寰呴殢璁�",
           value: 0,
         },
-        {
-          name: "宸插彂閫�",
-          value: 0,
-        },
+        // {
+        //   name: "宸插彂閫�",
+        //   value: 0,
+        // },
 
         // {
         //   name: "琛ㄥ崟宸插彂閫�",
@@ -883,7 +883,7 @@
           this.ycvalue = response.rows[0].yc;
           this.cardlist[2].value = response.rows[0].fssb;
           this.cardlist[3].value = response.rows[0].dsf;
-          this.cardlist[4].value = response.rows[0].yfs2;
+          // this.cardlist[4].value = response.rows[0].yfs2;
           this.yfsvalue = response.rows[0].yfs;
         }
         this.loading = false;

--
Gitblit v1.9.3