From c4fb35392368d6b826fceddce1911fe451153986 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 27 六月 2025 15:35:45 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/QuestionnaireTask.vue | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index bab3454..2a31d54 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -890,7 +890,7 @@
tableLabelhz: [
{ label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "鎮ｈ�呮爣绛�", width: "", prop: "tag" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
@@ -902,7 +902,7 @@
tableLabelhzwb: [
{ label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "sfzh" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "sfzh" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
@@ -958,6 +958,8 @@
topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
leavehospitaldistrictcodes: [],
leaveldeptcodes: [],
+ hospitaldistrictcodes: [],
+ deptcodes: [],
},
topicoptions: [{ children: [{ children: [] }] }],
showSearch: true, //
@@ -1496,15 +1498,15 @@
this.allpids.push(item.patid);
});
if (
- this.patientqueryParams.allhosp == 1 ||
(this.patientqueryParams.allhosp == 1 &&
- this.patientqueryParams.cry == 1)
+ !this.patientqueryParams.zsallhosp) ||
+ this.patientqueryParams.zsallhosp == 1
) {
this.tableLabelhz = [
// { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
{ label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "鎮ｈ�呮爣绛�", width: "200", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
@@ -1513,11 +1515,14 @@
{ label: "绉戝", width: "180", prop: "dept" },
{ label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
];
- } else if (this.patientqueryParams.allhosp == 4) {
+ } else if (
+ this.patientqueryParams.allhosp == 4 ||
+ this.patientqueryParams.zsallhosp == 4
+ ) {
this.tableLabelhz = [
{ label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "鎮ｈ�呮爣绛�", width: "200", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
@@ -1532,14 +1537,8 @@
} 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(
@@ -1557,6 +1556,31 @@
this.patientqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
+ // 鍑洪櫌杩樻槸鍏ラ櫌
+ if (
+ (this.patientqueryParams.allhosp == 1 &&
+ !this.patientqueryParams.zsallhosp) ||
+ this.patientqueryParams.zsallhosp == 1
+ ) {
+ this.patientqueryParams.cry = 1;
+ this.patientqueryParams.hospitaldistrictcodes = [];
+ this.patientqueryParams.deptcodes = [];
+ this.patientqueryParams.zsallhosp = "1";
+ } else if (
+ this.patientqueryParams.allhosp == 4 ||
+ this.patientqueryParams.zsallhosp == 4
+ ) {
+ this.patientqueryParams.deptcodes =
+ this.patientqueryParams.leaveldeptcodes;
+ this.patientqueryParams.hospitaldistrictcodes =
+ this.patientqueryParams.leavehospitaldistrictcodes;
+ this.patientqueryParams.leavehospitaldistrictcodes = [];
+ this.patientqueryParams.leaveldeptcodes = [];
+ this.patientqueryParams.cry = 0;
+ this.patientqueryParams.allhosp = "1";
+ this.patientqueryParams.zsallhosp = "4";
+ }
+
getTaskpatientQC(this.patientqueryParams).then((response) => {
this.patientuserList = response.rows;
this.patientuserList.forEach((item) => {
@@ -1585,11 +1609,11 @@
item.isoperation = 1;
item.patid = item.id;
item.hospType = this.patientqueryParams.allhosp;
- item.sfzh = item.idcardno;
+ item.sfzh = item.patientno;
item.deptCode = item.deptcode;
item.deptName = item.dept;
item.admindate = item.inhosptime;
- item.sfzh = item.idcardno;
+ item.sfzh = item.patientno;
if (this.patientqueryParams.allhosp == 6) {
item.patfrom = 1;
}
@@ -1672,13 +1696,14 @@
!this.patientqueryParams.leaveldeptcodes[0]
)
this.patientqueryParams.leaveldeptcodes = null;
+ console.log(this.patientqueryParams.allhosp, "bbblll");
this.handleAddpatient();
},
// 鑾峰彇澶栭儴鎮ｈ�呭鍏ュ垪琛�
Externallist() {
this.tableLabelhz = [
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
];
--
Gitblit v1.9.3