From b57c6c97c7de4cb5aeeb6c766a4642fac5b9b500 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 21 八月 2026 15:07:10 +0800
Subject: [PATCH] 测试完成
---
/dev/null | 0
src/views/sfstatistics/percentage/index copy.vue | 2
vue.config.js | 4
随访通用.zip | 0
src/views/sfstatistics/percentage/index.vue | 2
src/views/Satisfaction/diseaseStatistics/index.vue | 2
src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue | 24 +++++++-
src/views/patient/patient/outpatient.vue | 2
src/views/sfstatistics/percentage/satisfaction.vue | 1
src/views/Satisfaction/configurationmyd/batch.vue | 18 +++--
src/views/followvisit/discharge/index.vue | 108 +++++++++++++++++++++---------------
11 files changed, 104 insertions(+), 59 deletions(-)
diff --git a/src/views/Satisfaction/configurationmyd/batch.vue b/src/views/Satisfaction/configurationmyd/batch.vue
index bd73abe..750c893 100644
--- a/src/views/Satisfaction/configurationmyd/batch.vue
+++ b/src/views/Satisfaction/configurationmyd/batch.vue
@@ -143,9 +143,7 @@
</div>
<div class="patient-item">
<span class="label">鎬у埆锛�</span>
- <span class="value">{{
- row.patdescJson.sex
- }}</span>
+ <span class="value">{{ row.patdescJson.sex }}</span>
</div>
<div class="patient-item">
<span class="label">骞撮緞锛�</span>
@@ -599,7 +597,8 @@
created() {
// 浠庤矾鐢卞弬鏁拌幏鍙栭棶棰業D
- this.filterParams.scriptids = this.$route.query.questionId || this.$route.query.questionIds||null;
+ this.filterParams.scriptids =
+ this.$route.query.questionId || this.$route.query.questionIds || null;
// if (this.$route.query.questionId) {
// } else if (this.$route.query.questionIds) {
// console.log(
@@ -607,7 +606,7 @@
// "this.$route.query.questionIds"
// );
- this.filterParams.templateType = Number(this.$route.query.type)||null;
+ this.filterParams.templateType = Number(this.$route.query.type) || null;
// this.filterParams.scriptid = null;
// }
@@ -797,8 +796,10 @@
this.filterParams = {
todeptcode: "",
handleFlag: "",
- templateType: "",
- scriptids: null, // 淇濈暀闂ID
+ scriptids:
+ this.$route.query.questionId || this.$route.query.questionIds || null,
+ templateType: Number(this.$route.query.type) || null,
+
pageNum: 1,
pageSize: 10,
};
@@ -831,7 +832,8 @@
// 杩斿洖寮傚父鍒楄〃
handleGoBack() {
- this.$router.push("/satisfaction/exception/list");
+ // this.$router.push("/satisfaction/exception/list");
+ this.$router.push("/Intelligentcenter/dispose");
},
// 鏌ョ湅璇︽儏
diff --git a/src/views/Satisfaction/diseaseStatistics/index.vue b/src/views/Satisfaction/diseaseStatistics/index.vue
index 349e413..25abbf6 100644
--- a/src/views/Satisfaction/diseaseStatistics/index.vue
+++ b/src/views/Satisfaction/diseaseStatistics/index.vue
@@ -516,6 +516,8 @@
SeedetailsgGo(row) {
this.SeedetailsVisible = false;
+ this.infotitleVisible = false;
+
let type = "";
if (row.preachformson && row.preachformson.includes("3")) {
type = 1;
diff --git a/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue b/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
index 80f1160..c1cee6a 100644
--- a/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
+++ b/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
@@ -354,7 +354,7 @@
statisticaltype: 1,
leavehospitaldistrictcodes: ["all"],
deptcodes: [],
- serviceType: [2],
+ serviceType: [],
dateRange: [],
pageNum: 1,
pageSize: 20,
@@ -373,7 +373,25 @@
flatArraydept: [],
// 鏈嶅姟绫诲瀷閫夐」
- options: [],
+ options: [
+ {
+ value: 6,
+ label: "浣忛櫌婊℃剰搴�",
+ raw: {
+ cssClass: "",
+ listClass: "",
+ },
+ },
+
+ {
+ value: 14,
+ label: "闂ㄨ瘖婊℃剰搴�",
+ raw: {
+ cssClass: "",
+ listClass: "",
+ },
+ },
+ ],
// 琛ㄦ牸鏁版嵁
userList: [],
@@ -457,7 +475,7 @@
// 鑾峰彇绉戝鏍�
getDeptTree() {
// 鑾峰彇鏈嶅姟绫诲瀷
- this.options = this.$store.getters.tasktypes || [];
+ // this.options = this.$store.getters.tasktypes || [];
// 鑾峰彇绉戝鍒楄〃
this.flatArraydept = (this.$store.getters.belongDepts || []).map(
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 15b77d9..2412250 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -92,10 +92,11 @@
v-model="topqueryParams.scopetype"
placeholder="榛樿鍏ㄩ儴"
:options="sourcetype"
- :props="{ expandTrigger: 'hover' }"
+ :props="{ expandTrigger: 'hover', multiple: true }"
@change="handleChange"
filterable
clearable
+ collapse-tags
></el-cascader>
</el-form-item>
@@ -1192,6 +1193,7 @@
label: "鍏ㄩ儴",
},
],
+ lastScopeType: 3, // 鎮ｈ�呰寖鍥翠笂娆￠�夋嫨鐨勪竴绾х被鍨嬶紙1=绉戝锛�2=鐥呭尯锛�3=鍏ㄩ儴锛�
loading: false,
cardlist: [
{
@@ -1293,7 +1295,7 @@
visitCount: 1,
scopetype: [],
managementDoctor:
- localStorage.getItem("orgname") == "缂欎簯鍘夸汉姘戝尰闄�"
+ localStorage.getItem("orgname") == "缂欎簯鍘夸汉姘戝尰闄�"||localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌"
? store.getters.nickName
: "",
leaveldeptcodes: [],
@@ -1493,13 +1495,7 @@
/** 鏌ヨ闅忚鏈嶅姟鍒楄〃 */
async getList(refresh) {
// 榛樿鍏ㄩ儴
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+ this.applyDeptWardScope();
if (this.endOut == 0) {
this.topqueryParams.endSendDateTime = this.formatDateToYYYYMMDDHHMMSS(
this.getEndOfDay()
@@ -1681,13 +1677,7 @@
if (type) {
this.resetQuerykj();
}
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+ this.applyDeptWardScope();
// 鎺ュ彈寮傚父璺宠浆
if (this.errtype) {
this.topqueryParams.leavehospitaldistrictcodes.push(
@@ -1795,13 +1785,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery(refresh) {
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+ this.applyDeptWardScope();
this.topqueryParams.pageNum = 1;
// 鍒ゆ柇鏄笉鏄伐浣滃彴蹇嵎鏌ヨ
if (this.errtype != 2) {
@@ -1812,33 +1796,65 @@
}
this.getList(refresh);
},
- // 鎮ｈ�呰寖鍥村鐞�
+ // 鎮ｈ�呰寖鍥村鐞嗭細浠庡閫夌骇鑱� scopetype 瑙ｆ瀽绉戝/鐥呭尯
+ applyDeptWardScope() {
+ const value = this.topqueryParams.scopetype || [];
+ const deptCodes = [];
+ const wardCodes = [];
+ let isAll = false;
+
+ value.forEach((item) => {
+ const type = item[0];
+ if (type == 3) {
+ isAll = true;
+ } else if (type == 1) {
+ deptCodes.push(item[item.length - 1]);
+ } else if (type == 2) {
+ wardCodes.push(item[item.length - 1]);
+ }
+ });
+
+ // 閫変簡鍏ㄩ儴 鎴� 鏈�夋嫨 鈫� 鐢ㄦ埛鍏ㄩ儴绉戝/鐥呭尯
+ if (isAll || (!deptCodes.length && !wardCodes.length)) {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
+ } else {
+ this.topqueryParams.leaveldeptcodes = deptCodes;
+ this.topqueryParams.leavehospitaldistrictcodes = wardCodes;
+ }
+ },
+ // 鎮ｈ�呰寖鍥村閫夊彉鏇达紙绉戝/鐥呭尯浜掓枼锛�
handleChange(value) {
- console.log("閫夋嫨鐨勬偅鑰呰寖鍥�:", value);
+ const types = (value || []).map((item) => item[0]);
+ const hasDept = types.includes(1);
+ const hasWard = types.includes(2);
- // 娓呯┖涔嬪墠鐨勬煡璇㈠弬鏁�
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.leaveldeptcodes = [];
- this.topqueryParams.searchscope = null;
-
- if (!value || value.length === 0) {
+ // 浜掓枼锛氱瀹ゅ拰鐥呭尯涓嶈兘鍚屾椂閫�
+ if (hasDept && hasWard) {
+ if (this.lastScopeType == 1) {
+ // 涓婃閫変簡绉戝锛岃繖娆℃柊澧炵梾鍖� 鈫� 淇濈暀鐥呭尯
+ this.topqueryParams.scopetype = value.filter(
+ (item) => item[0] === 2
+ );
+ this.lastScopeType = 2;
+ this.$message.warning("绉戝鍜岀梾鍖轰笉鑳藉悓鏃堕�夋嫨锛屽凡鍒囨崲涓虹梾鍖�");
+ } else {
+ // 涓婃閫変簡鐥呭尯锛岃繖娆℃柊澧炵瀹� 鈫� 淇濈暀绉戝
+ this.topqueryParams.scopetype = value.filter(
+ (item) => item[0] === 1
+ );
+ this.lastScopeType = 1;
+ this.$message.warning("绉戝鍜岀梾鍖轰笉鑳藉悓鏃堕�夋嫨锛屽凡鍒囨崲涓虹瀹�");
+ }
+ this.applyDeptWardScope();
return;
}
- let type = value[0];
- let code = value.slice(-1)[0];
-
- if (type == 1) {
- this.topqueryParams.leaveldeptcodes.push(code);
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.searchscope = 1;
- } else if (type == 2) {
- this.topqueryParams.leavehospitaldistrictcodes.push(code);
- this.topqueryParams.leaveldeptcodes = [];
- this.topqueryParams.searchscope = 2;
- } else {
- this.topqueryParams.searchscope = 3;
- }
+ this.lastScopeType = hasDept ? 1 : hasWard ? 2 : 3;
+ this.applyDeptWardScope();
},
// 鏈嶅姟鐘舵�佸彉鏇村鐞�
handleServiceStatusChange(value) {
@@ -1876,6 +1892,7 @@
this.dateRange = [];
this.dateRangefs = [];
this.serviceStatusValue = 10;
+ this.lastScopeType = 3;
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
@@ -1895,6 +1912,7 @@
this.dateRange = [];
this.dateRangefs = [];
this.serviceStatusValue = null;
+ this.lastScopeType = 3;
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index c277633..2f40eda 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -1232,7 +1232,7 @@
return;
}
this.archivePatients = this.userList.filter((item) =>
- this.ids.includes(item.patid)
+ this.ids.includes(item.id)
);
this.archiveDialogVisible = true;
},
diff --git a/src/views/sfstatistics/percentage/index copy.vue b/src/views/sfstatistics/percentage/index copy.vue
index dc2d0ad..9917362 100644
--- a/src/views/sfstatistics/percentage/index copy.vue
+++ b/src/views/sfstatistics/percentage/index copy.vue
@@ -2204,6 +2204,8 @@
},
SeedetailsgGo(row) {
this.SeedetailsVisible = false;
+ this.infotitleVisible = false;
+
let type = "";
if (row.preachformson && row.preachformson.includes("3")) {
type = 1;
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index d6254f3..e972387 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -521,6 +521,8 @@
SeedetailsgGo(row) {
this.SeedetailsVisible = false;
+ this.infotitleVisible = false;
+
let type = "";
if (row.preachformson && row.preachformson.includes("3")) {
type = 1;
diff --git a/src/views/sfstatistics/percentage/satisfaction.vue b/src/views/sfstatistics/percentage/satisfaction.vue
index c409b36..9e1b901 100644
--- a/src/views/sfstatistics/percentage/satisfaction.vue
+++ b/src/views/sfstatistics/percentage/satisfaction.vue
@@ -880,6 +880,7 @@
},
SeedetailsgGo(row) {
this.SeedetailsVisible = false;
+
let type = "";
if (row.preachformson && row.preachformson.includes("3")) {
type = 1;
diff --git a/vue.config.js b/vue.config.js
index 7f985b0..fe4bda0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,10 +37,10 @@
[process.env.VUE_APP_BASE_API]: {
// target: `https://www.health-y.cn/lssf`,
// target: `http://192.168.100.10:8096`,
- target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
+ // target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
// target: `http://192.168.100.10:8095`,//鏂板崕
// target: `http://192.168.100.10:8098`,//甯備竴
- // target:`http://localhost:8095`,
+ target:`http://localhost:8095`,
// target:`http://35z1t16164.qicp.vip`,
// target: `http://192.168.100.172:8095`,
// target: `http://192.168.100.10:8089`,//鍗楀崕
diff --git "a/\351\232\217\350\256\277\345\244\226\351\223\276.zip" "b/\351\232\217\350\256\277\345\244\226\351\223\276.zip"
deleted file mode 100644
index a328946..0000000
--- "a/\351\232\217\350\256\277\345\244\226\351\223\276.zip"
+++ /dev/null
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\2508.18.zip" "b/\351\232\217\350\256\277\351\200\232\347\224\250.zip"
similarity index 93%
rename from "\351\232\217\350\256\277\351\200\232\347\224\2508.18.zip"
rename to "\351\232\217\350\256\277\351\200\232\347\224\250.zip"
index 73edf37..a6487af 100644
--- "a/\351\232\217\350\256\277\351\200\232\347\224\2508.18.zip"
+++ "b/\351\232\217\350\256\277\351\200\232\347\224\250.zip"
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\2508.14.zip" "b/\351\232\217\350\256\277\351\200\232\347\224\2508.14.zip"
deleted file mode 100644
index ea19429..0000000
--- "a/\351\232\217\350\256\277\351\200\232\347\224\2508.14.zip"
+++ /dev/null
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\2508.17.zip" "b/\351\232\217\350\256\277\351\200\232\347\224\2508.17.zip"
deleted file mode 100644
index c240972..0000000
--- "a/\351\232\217\350\256\277\351\200\232\347\224\2508.17.zip"
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3