From b4fe2c16274a91fee4fb26d91374f95fbe2dbcec Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 09 十一月 2026 15:28:21 +0800
Subject: [PATCH] 测试完成
---
src/views/sfstatistics/percentage/index.vue | 140 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 130 insertions(+), 10 deletions(-)
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index 713e2a2..9fdb102 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -14,6 +14,7 @@
<el-select
v-model="queryParams.statisticaltype"
placeholder="璇烽�夋嫨缁熻绫诲瀷"
+ @change="handleQuery"
>
<el-option
v-for="item in Statisticallist"
@@ -57,8 +58,7 @@
<el-form-item label="鏈嶅姟绫诲瀷" prop="userName">
<el-select
- v-model="queryParams.serviceType"
- multiple
+ v-model="serviceTypeSingle"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -70,9 +70,41 @@
</el-select>
</el-form-item>
+ <el-form-item label="浠诲姟" prop="taskIds">
+ <el-select
+ v-model="queryParams.taskIds"
+ multiple
+ filterable
+ clearable
+ collapse-tags
+ placeholder="璇烽�夋嫨浠诲姟"
+ style="width: 220px"
+ >
+ <el-option
+ v-for="item in taskList"
+ :key="item.taskid"
+ :label="item.taskName"
+ :value="item.taskid"
+ />
+ </el-select>
+ </el-form-item>
+
<el-form-item label-width="200" label="搴旈殢璁挎椂闂磋寖鍥�" prop="userName">
<el-date-picker
v-model="queryParams.dateRange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="daterange"
+ unlink-panels
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:59:59']"
+ :picker-options="pickerOptions"
+ />
+ </el-form-item>
+ <el-form-item label-width="200" label="鍑洪櫌鏃堕棿鑼冨洿" prop="userName">
+ <el-date-picker
+ v-model="queryParams.dateRangecy"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
unlink-panels
@@ -119,6 +151,21 @@
<!-- Tab鍒囨崲鍖哄煙 -->
<div class="tab-section">
<el-tabs v-model="activeTab" @tab-click="handleTabClick">
+ <el-tab-pane
+ label="缁煎悎缁熻"
+ v-if="orgname == '涓芥按甯備腑鍖婚櫌'"
+ name="combined"
+ >
+ <CombinedFollowUp
+ ref="combinedFollowUp"
+ :query-params="queryParams"
+ :flat-array-hospit="flatArrayhospit"
+ :flat-array-dept="flatArraydept"
+ :options="options"
+ :orgname="orgname"
+ @view-details="viewDetails"
+ />
+ </el-tab-pane>
<el-tab-pane label="棣栨闅忚" name="first">
<FirstFollowUp
ref="firstFollowUp"
@@ -166,6 +213,7 @@
<ChartDialog
:visible="chartDialogVisible"
:data="chartData"
+ :statisticaltype="queryParams.statisticaltype"
:active-tab="activeTab"
@close="chartDialogVisible = false"
/>
@@ -200,8 +248,8 @@
import ChartDialog from "./components/ChartDialog.vue";
import DetailDialog from "./components/DetailDialog.vue";
import TimelyRateDialog from "./components/TimelyRateDialog.vue";
-
-import { getSfStatisticsHyperlink } from "@/api/AiCentre/index";
+import CombinedFollowUp from "./components/CombinedFollowUp.vue";
+import { getSfStatisticsHyperlink, getTasklist } from "@/api/AiCentre/index";
export default {
name: "Percentage",
@@ -212,6 +260,7 @@
ChartDialog,
DetailDialog,
TimelyRateDialog,
+ CombinedFollowUp,
},
data() {
return {
@@ -224,10 +273,19 @@
options: this.$store.getters.tasktypes,
queryParams: {
serviceType: [2],
- dateRange: this.getLastMonthRange(),
- statisticaltype: 1,
+ dateRange:
+ localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌"
+ ? this.getLastMonthRange()
+ : [],
+ dateRangecy: '',
+ statisticaltype:
+ localStorage.getItem("orgname") == "缂欎簯鍘夸汉姘戝尰闄�" ||
+ localStorage.getItem("orgname") == "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�"
+ ? 2
+ : 1,
leavehospitaldistrictcodes: ["all"],
- deptcodes: [],
+ deptcodes: ["all"],
+ taskIds: [],
},
pickerOptions: {
shortcuts: [
@@ -262,6 +320,7 @@
},
flatArrayhospit: [],
flatArraydept: [],
+ taskList: [],
allDeptCodes: [],
allWardCodes: [],
showSearch: true,
@@ -283,8 +342,29 @@
},
};
},
+ computed: {
+ // 鏈嶅姟绫诲瀷鍗曢�夛細UI 缁戝畾鍗曞�硷紝鍐呴儴浠嶄互鏁扮粍褰㈠紡浼犵粰鍚庣
+ serviceTypeSingle: {
+ get() {
+ const st = this.queryParams.serviceType;
+ return Array.isArray(st) ? st[0] : st;
+ },
+ set(val) {
+ this.queryParams.serviceType = val == null || val === "" ? [] : [val];
+ },
+ },
+ },
created() {
this.getDeptTree();
+ // 褰撳墠鏈烘瀯涓轰附姘村競涓尰闄㈡椂锛屽簲闅忚鏃堕棿鑼冨洿榛樿鏈�杩戜竴涓湀骞剁洿鎺ュ簲鐢�
+ if (localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌") {
+ this.queryParams.startTime = this.parseTime(
+ this.queryParams.dateRange[0]
+ );
+ this.queryParams.endTime = this.parseTime(
+ this.queryParams.dateRange[1]
+ );
+ }
this.loadCurrentTabData();
},
methods: {
@@ -313,6 +393,11 @@
this.flatArraydept.push({ label: "鍏ㄩ儴", value: "all" });
this.flatArrayhospit.push({ label: "鍏ㄩ儴", value: "all" });
+
+ // 浠诲姟鍒楄〃锛堢敤浜庝换鍔$瓫閫夛級
+ getTasklist({ pageNum: 1, pageSize: 100 }).then((response) => {
+ this.taskList = response.rows || [];
+ });
},
// 娣诲姞鑾峰彇鏈�杩戜竴涓湀鏃堕棿鑼冨洿鐨勬柟娉�
getLastMonthRange() {
@@ -353,15 +438,26 @@
case "continued":
this.$refs.continuedCare.loadData();
break;
+ case "combined":
+ this.$refs.combinedFollowUp.loadData();
+ break;
}
},
handleQuery() {
+ if (!this.queryParams.dateRange) this.queryParams.dateRange = [];
+ if (!this.queryParams.dateRangecy) this.queryParams.dateRangecy = [];
+
this.queryParams.startTime = this.parseTime(
this.queryParams.dateRange[0]
);
this.queryParams.endTime = this.parseTime(this.queryParams.dateRange[1]);
-
+ this.queryParams.hospitalStartTime = this.parseTime(
+ this.queryParams.dateRangecy[0]
+ );
+ this.queryParams.hospitalEndTime = this.parseTime(
+ this.queryParams.dateRangecy[1]
+ );
if (this.queryParams.statisticaltype == 1) {
this.queryParams.deptcodes = [];
} else if (this.queryParams.statisticaltype == 2) {
@@ -374,6 +470,7 @@
resetQuery() {
this.queryParams.dateRange = [];
this.queryParams.leavehospitaldistrictcodes = [];
+ this.queryParams.taskIds = [];
this.handleQuery();
},
@@ -387,6 +484,9 @@
break;
case "continued":
await this.$refs.continuedCare.exportTable();
+ break;
+ case "combined":
+ await this.$refs.combinedFollowUp.exportTable();
break;
}
},
@@ -404,6 +504,8 @@
return this.$refs.secondFollowUp.tableData;
case "continued":
return this.$refs.continuedCare.tableData;
+ case "combined":
+ return this.$refs.combinedFollowUp.tableData;
default:
return [];
}
@@ -420,6 +522,7 @@
if (type == 1) {
obj.drcode = row.drcode;
}
+ // 缁熻绫诲瀷锛氱梾鍖虹粺璁�(1)浼犵梾鍖篶ode锛岀瀹ょ粺璁�(2)浼犵瀹ode
if (this.queryParams.statisticaltype == 1) {
obj.leavehospitaldistrictcodes = [row.leavehospitaldistrictcode];
obj.deptcodes = [];
@@ -427,8 +530,23 @@
obj.deptcodes = [row.deptcode];
obj.leavehospitaldistrictcodes = [];
}
- obj.endTime = this.queryParams.endTime;
- obj.startTime = this.queryParams.startTime;
+ // 搴旈殢璁挎椂闂磋寖鍥�
+ if (this.queryParams.endTime) {
+ obj.endTime = this.queryParams.endTime;
+ obj.startTime = this.queryParams.startTime;
+ } else {
+ obj.startTime = this.parseTime(this.queryParams.dateRange[0]);
+ obj.endTime = this.parseTime(this.queryParams.dateRange[1]);
+ }
+ // 鍑洪櫌鏃堕棿鑼冨洿
+ if (this.queryParams.hospitalEndTime) {
+ obj.hospitalEndTime = this.queryParams.hospitalEndTime;
+ obj.hospitalStartTime = this.queryParams.hospitalStartTime;
+ } else {
+ obj.hospitalStartTime = this.parseTime(this.queryParams.dateRangecy[0]);
+ obj.hospitalEndTime = this.parseTime(this.queryParams.dateRangecy[1]);
+ }
+
obj.statisticaltype = this.queryParams.statisticaltype;
getSfStatisticsHyperlink(obj).then((response) => {
@@ -464,6 +582,8 @@
SeedetailsgGo(row) {
this.SeedetailsVisible = false;
+ this.infotitleVisible = false;
+
let type = "";
if (row.preachformson && row.preachformson.includes("3")) {
type = 1;
--
Gitblit v1.9.3