From 77970a545af56e946e439ead97b23557d0b44f0f Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 12 八月 2026 15:54:08 +0800
Subject: [PATCH] 提交

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

diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index ca39454..9a068e7 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -132,6 +132,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 +194,7 @@
     <ChartDialog
       :visible="chartDialogVisible"
       :data="chartData"
+      :statisticaltype="queryParams.statisticaltype"
       :active-tab="activeTab"
       @close="chartDialogVisible = false"
     />
@@ -213,7 +229,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 +241,7 @@
     ChartDialog,
     DetailDialog,
     TimelyRateDialog,
+    CombinedFollowUp,
   },
   data() {
     return {
@@ -239,9 +256,13 @@
         serviceType: [2],
         dateRange: this.getLastMonthRange(),
         dateRangecy: [],
-        statisticaltype: 1,
+        statisticaltype:
+          localStorage.getItem("orgname") == "缂欎簯鍘夸汉姘戝尰闄�" ||
+          localStorage.getItem("orgname") == "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�"
+            ? 2
+            : 1,
         leavehospitaldistrictcodes: ["all"],
-        deptcodes: [],
+        deptcodes: ["all"],
       },
       pickerOptions: {
         shortcuts: [
@@ -367,6 +388,9 @@
         case "continued":
           this.$refs.continuedCare.loadData();
           break;
+        case "combined":
+          this.$refs.combinedFollowUp.loadData();
+          break;
       }
     },
 
@@ -407,6 +431,9 @@
         case "continued":
           await this.$refs.continuedCare.exportTable();
           break;
+        case "combined":
+          await this.$refs.combinedFollowUp.exportTable();
+          break;
       }
     },
 
@@ -423,6 +450,8 @@
           return this.$refs.secondFollowUp.tableData;
         case "continued":
           return this.$refs.continuedCare.tableData;
+        case "combined":
+          return this.$refs.combinedFollowUp.tableData;
         default:
           return [];
       }
@@ -446,8 +475,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) => {

--
Gitblit v1.9.3