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

---
 src/views/patient/propaganda/QuestionnaireTask.vue |   73 ++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 651b294..a8e83be 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -438,7 +438,7 @@
       </div>
       <!-- 浠诲姟璇︽儏 -->
       <div v-if="Editprogress == 2">
-        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
+        <el-alert title="鍦ㄦ湰闃舵閫夋嫨闅忚鐥呬汉" type="success" effect="dark">
         </el-alert>
         <div class="leftvlue-jbxx">
           <div class="examine-jic">
@@ -550,6 +550,12 @@
               <el-form-item label="鎮h�呰瘖鏂細">
                 <el-input
                   v-model="patientqueryParams.leavediagname"
+                  @keyup.enter.native="handleQuery"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="涓绘不鍖荤敓锛�">
+                <el-input
+                  v-model="patientqueryParams.drname"
                   @keyup.enter.native="handleQuery"
                 ></el-input>
               </el-form-item>
@@ -1026,7 +1032,6 @@
       patientqueryParams: {
         pageNum: 1, //
         pageSize: 10,
-        topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
         leavehospitaldistrictcodes: [],
         leaveldeptcodes: [],
       },
@@ -1109,11 +1114,11 @@
       },
       taskoptions: [
         {
-          value: "1",
+          value: "4",
           label: "鍑洪櫌鐥呬汉",
         },
         {
-          value: "4",
+          value: "1",
           label: "鍦ㄩ櫌鐥呬汉",
         },
         {
@@ -1687,11 +1692,7 @@
       this.overallCase.forEach((item) => {
         this.allpids.push(item.patid);
       });
-      if (
-        this.patientqueryParams.allhosp == 1 ||
-        (this.patientqueryParams.allhosp == 1 &&
-          this.patientqueryParams.cry == 1)
-      ) {
+      if (this.patientqueryParams.allhosp == 4) {
         this.tableLabelhz = [
           // { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
           { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
@@ -1706,7 +1707,7 @@
           { label: "绉戝", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
-      } else if (this.patientqueryParams.allhosp == 4) {
+      } else if (this.patientqueryParams.allhosp == 1) {
         this.tableLabelhz = [
           { label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
           { label: "鎮h��", width: "", prop: "name" },
@@ -1726,30 +1727,18 @@
       } else {
         this.patientqueryParams.pids = null;
       }
-      // 绫诲瀷鍒ゆ柇
-      if (this.patientqueryParams.allhosp == 1) {
-        this.patientqueryParams.cry = 1;
-      } else if (this.patientqueryParams.allhosp == 4) {
-        this.patientqueryParams.cry = 0;
-        this.patientqueryParams.allhosp = "1";
-      }
       // 鏉ユ簮鍒ゆ柇
 
-      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;
@@ -1836,7 +1825,6 @@
     getList() {},
     handleQuery() {
       // 鑾峰彇澶栭儴鎮h��
-      console.log(this.patientqueryParams.allhosp, "aaalll");
 
       if (this.patientqueryParams.allhosp == 6) {
         this.Externallist();
@@ -1844,19 +1832,22 @@
 
         return;
       }
-      if (this.patientqueryParams.topica == 0) {
+      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.leavehospitaldistrictcodes;
-        this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
-      } else if (this.patientqueryParams.topica == 1) {
-        this.patientqueryParams.leavehospitaldistrictcodes = null;
-        this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
-      } else if (this.patientqueryParams.topica == 2) {
+          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.leavehospitaldistrictcodes;
-        this.patientqueryParams.leaveldeptcodes = null;
+          store.getters.belongWards.map((obj) => obj.districtCode);
       }
-
       if (
         !this.patientqueryParams.leavehospitaldistrictcodes ||
         !this.patientqueryParams.leavehospitaldistrictcodes[0]

--
Gitblit v1.9.3