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] 测试完成

---
 src/views/sfstatistics/percentage/index.vue |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index d8e3072..e972387 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"
@@ -132,6 +133,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"
@@ -179,6 +195,7 @@
     <ChartDialog
       :visible="chartDialogVisible"
       :data="chartData"
+      :statisticaltype="queryParams.statisticaltype"
       :active-tab="activeTab"
       @close="chartDialogVisible = false"
     />
@@ -213,7 +230,7 @@
 import ChartDialog from "./components/ChartDialog.vue";
 import DetailDialog from "./components/DetailDialog.vue";
 import TimelyRateDialog from "./components/TimelyRateDialog.vue";
-
+import CombinedFollowUp from "./components/CombinedFollowUp.vue";
 import { getSfStatisticsHyperlink } from "@/api/AiCentre/index";
 
 export default {
@@ -225,6 +242,7 @@
     ChartDialog,
     DetailDialog,
     TimelyRateDialog,
+    CombinedFollowUp,
   },
   data() {
     return {
@@ -237,10 +255,13 @@
       options: this.$store.getters.tasktypes,
       queryParams: {
         serviceType: [2],
-        dateRange: this.getLastMonthRange(),
-        dateRangecy: [],
+        dateRange: [],
+        dateRangecy: this.getLastMonthRange(),
         statisticaltype:
-          localStorage.getItem("orgname") == "缂欎簯鍘夸汉姘戝尰闄�" ? 2 : 1,
+          localStorage.getItem("orgname") == "缂欎簯鍘夸汉姘戝尰闄�" ||
+          localStorage.getItem("orgname") == "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�"
+            ? 2
+            : 1,
         leavehospitaldistrictcodes: ["all"],
         deptcodes: ["all"],
       },
@@ -368,10 +389,15 @@
         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.dateRange = [];
       this.queryParams.startTime = this.parseTime(
         this.queryParams.dateRange[0]
       );
@@ -408,6 +434,9 @@
         case "continued":
           await this.$refs.continuedCare.exportTable();
           break;
+        case "combined":
+          await this.$refs.combinedFollowUp.exportTable();
+          break;
       }
     },
 
@@ -424,6 +453,8 @@
           return this.$refs.secondFollowUp.tableData;
         case "continued":
           return this.$refs.continuedCare.tableData;
+        case "combined":
+          return this.$refs.combinedFollowUp.tableData;
         default:
           return [];
       }
@@ -447,8 +478,14 @@
         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]);
+      }
+
       obj.statisticaltype = this.queryParams.statisticaltype;
 
       getSfStatisticsHyperlink(obj).then((response) => {
@@ -484,6 +521,8 @@
 
     SeedetailsgGo(row) {
       this.SeedetailsVisible = false;
+      this.infotitleVisible = false;
+
       let type = "";
       if (row.preachformson && row.preachformson.includes("3")) {
         type = 1;

--
Gitblit v1.9.3