From a90765e9ee65717c6ba9923a90b3fc21c03753c1 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 18 十一月 2026 15:29:51 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/operationAgain/index.vue                        |   16 +
 src/views/index.vue                                                   |  109 ++++++-
 src/views/followvisit/again/index.vue                                 |   16 +
 src/views/login.vue                                                   |    2 
 vue.config.js                                                         |    6 
 src/views/followvisit/record/detailpage/index.vue                     |   92 +++++++
 src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue |    5 
 src/views/followvisit/operation/index.vue                             |   16 +
 src/views/knowledge/questionnaire/compilequer/index.vue               |   83 +++--
 src/views/sfstatistics/percentage/components/FirstFollowUp.vue        |  391 +++++++++++++++++++++++++----
 src/views/Satisfaction/sfstatistics/components/visitStatistics.vue    |    5 
 src/views/followvisit/discharge/index.vue                             |   19 +
 12 files changed, 620 insertions(+), 140 deletions(-)

diff --git a/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue b/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
index a5c3cf5..197cde2 100644
--- a/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
+++ b/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
@@ -1509,10 +1509,7 @@
             const topic = topiclist[key];
             if (!topic || !topic.scriptContent) return;
 
-            const tKey =
-              topic.scriptid != null && topic.scriptid !== ""
-                ? String(topic.scriptid)
-                : topic.scriptContent;
+            const tKey = topic.scriptContent;
 
             if (!topicMap.has(tKey)) {
               topicMap.set(tKey, {
diff --git a/src/views/Satisfaction/sfstatistics/components/visitStatistics.vue b/src/views/Satisfaction/sfstatistics/components/visitStatistics.vue
index ea36ad9..7a11b06 100644
--- a/src/views/Satisfaction/sfstatistics/components/visitStatistics.vue
+++ b/src/views/Satisfaction/sfstatistics/components/visitStatistics.vue
@@ -892,10 +892,7 @@
             const topic = topiclist[key];
             if (!topic || !topic.scriptContent) return;
 
-            const tKey =
-              topic.scriptid != null && topic.scriptid !== ""
-                ? String(topic.scriptid)
-                : topic.scriptContent;
+            const tKey = topic.scriptContent;
 
             if (!topicMap.has(tKey)) {
               topicMap.set(tKey, {
diff --git a/src/views/followvisit/again/index.vue b/src/views/followvisit/again/index.vue
index 9984406..1d233a6 100644
--- a/src/views/followvisit/again/index.vue
+++ b/src/views/followvisit/again/index.vue
@@ -45,6 +45,17 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
+           <el-form-item label="闅忚瀹屾垚鏃堕棿">
+          <el-date-picker
+            v-model="dateRangefts"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
 
         <el-form-item label="鎮h�呭鍚�" prop="sendname">
           <el-input
@@ -871,6 +882,7 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       dateRangefs: [],
+      dateRangefts: [],
       // 宀椾綅閫夐」
       postOptions: [],
       ruleForm: {
@@ -1379,7 +1391,8 @@
       this.topqueryParams.endOutHospTime = this.dateRange[1];
       this.topqueryParams.startSendDateTime = this.dateRangefs[0];
       this.topqueryParams.endSendDateTime = this.dateRangefs[1];
-      console.log("2");
+  this.topqueryParams.finishtimeStart = this.dateRangefts[0];
+        this.topqueryParams.finishtimeEnd = this.dateRangefts[1];
       this.getList(refresh);
     },
     // 鎮h�呰寖鍥村鐞�
@@ -1438,6 +1451,7 @@
     resetQuery() {
       this.dateRange = [];
       this.dateRangefs = [];
+      this.dateRangefts = [];
       this.serviceStatusValue = 10;
 
       this.topqueryParams = {
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 5712ad2..811bafd 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -47,6 +47,17 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
+        <el-form-item label="闅忚瀹屾垚鏃堕棿">
+          <el-date-picker
+            v-model="dateRangefts"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
 
         <el-form-item label="鎮h�呭鍚�" prop="sendname">
           <el-input
@@ -1245,6 +1256,7 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       dateRangefs: [],
+      dateRangefts: [],
       // 宀椾綅閫夐」
       postOptions: [],
       ruleForm: {
@@ -1701,7 +1713,8 @@
 
       try {
         // 褰撳墠鎵ц鏂瑰紡涓哄閫夛紝闇�杞垚閫楀彿鍒嗛殧瀛楃涓诧紙濡� 1,2,5锛�
-        const params = { ...this.topqueryParams };
+        // 鍙犲姞椤堕儴鍗$墖鐐瑰嚮甯︽潵鐨勪复鏃剁瓫閫夛紙cardFilter锛�
+        const params = this.applyCardFilter({ ...this.topqueryParams });
         if (Array.isArray(params.currentPreachforms)) {
           params.currentPreachforms = params.currentPreachforms.join(",");
         }
@@ -1979,6 +1992,8 @@
         this.topqueryParams.endOutHospTime = this.dateRange[1];
         this.topqueryParams.startSendDateTime = this.dateRangefs[0];
         this.topqueryParams.endSendDateTime = this.dateRangefs[1];
+         this.topqueryParams.finishtimeStart = this.dateRangefts[0];
+        this.topqueryParams.finishtimeEnd = this.dateRangefts[1];
       }
       this.getList(refresh);
     },
@@ -2163,6 +2178,7 @@
     resetQuery() {
       this.dateRange = [];
       this.dateRangefs = [];
+      this.dateRangefts = [];
       this.serviceStatusValue = 10;
       this.lastScopeType = 3;
       this.topqueryParams = {
@@ -2185,6 +2201,7 @@
     resetQuerykj() {
       this.dateRange = [];
       this.dateRangefs = [];
+      this.dateRangefts = [];
       this.serviceStatusValue = null;
       this.lastScopeType = 3;
       this.topqueryParams = {
diff --git a/src/views/followvisit/operation/index.vue b/src/views/followvisit/operation/index.vue
index b0d100e..0f45670 100644
--- a/src/views/followvisit/operation/index.vue
+++ b/src/views/followvisit/operation/index.vue
@@ -126,6 +126,17 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
+           <el-form-item label="闅忚瀹屾垚鏃堕棿">
+          <el-date-picker
+            v-model="dateRangefts"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
 
         <el-form-item label="鎮h�呭鍚�" prop="sendname">
           <el-input
@@ -1182,6 +1193,7 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       dateRangefs: [],
+      dateRangefts: [],
       // 宀椾綅閫夐」
       postOptions: [],
       ruleForm: {
@@ -1776,6 +1788,8 @@
         this.topqueryParams.endOutHospTime = this.dateRange[1];
         this.topqueryParams.startSendDateTime = this.dateRangefs[0];
         this.topqueryParams.endSendDateTime = this.dateRangefs[1];
+          this.topqueryParams.finishtimeStart = this.dateRangefts[0];
+        this.topqueryParams.finishtimeEnd = this.dateRangefts[1];
       }
       this.getList(refresh);
     },
@@ -1832,6 +1846,8 @@
     resetQuery() {
       this.dateRange = [];
       this.dateRangefs = [];
+      this.dateRangefts = [];
+
       this.serviceStatusValue = 10;
 
       this.topqueryParams = {
diff --git a/src/views/followvisit/operationAgain/index.vue b/src/views/followvisit/operationAgain/index.vue
index 5abcbbe..dd6a243 100644
--- a/src/views/followvisit/operationAgain/index.vue
+++ b/src/views/followvisit/operationAgain/index.vue
@@ -45,6 +45,17 @@
             end-placeholder="缁撴潫鏃ユ湡"
           ></el-date-picker>
         </el-form-item>
+        <el-form-item label="闅忚瀹屾垚鏃堕棿">
+          <el-date-picker
+            v-model="dateRangefts"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
 
         <el-form-item label="鎮h�呭鍚�" prop="sendname">
           <el-input
@@ -867,6 +878,7 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       dateRangefs: [],
+      dateRangefts: [],
       // 宀椾綅閫夐」
       postOptions: [],
       ruleForm: {
@@ -1371,7 +1383,8 @@
       this.topqueryParams.endOutHospTime = this.dateRange[1];
       this.topqueryParams.startSendDateTime = this.dateRangefs[0];
       this.topqueryParams.endSendDateTime = this.dateRangefs[1];
-      console.log("2");
+     this.topqueryParams.finishtimeStart = this.dateRangefts[0];
+        this.topqueryParams.finishtimeEnd = this.dateRangefts[1];
       this.getList(refresh);
     },
     // 鎮h�呰寖鍥村鐞�
@@ -1430,6 +1443,7 @@
     resetQuery() {
       this.dateRange = [];
       this.dateRangefs = [];
+      this.dateRangefts = [];
       this.serviceStatusValue = 10;
 
       this.topqueryParams = {
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 9321ac3..0340bf4 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -1465,6 +1465,7 @@
 import {
   messagelistpatient,
   alterpatient,
+  particularpatient,
   listcontactinformation,
 } from "@/api/patient/homepage";
 import CallButton from "@/components/CallButton";
@@ -1846,7 +1847,8 @@
     unansweredQuestions() {
       return (this.tableDatatop || [])
         .map((item, i) => ({ index: i + 1, title: item.scriptContent || "鏈懡鍚嶉鐩�", raw: item }))
-        .filter((q) => !this.hasOptionValue(q.raw));
+        // astrict=1 琛ㄧず璇ラ鍥犻�夐」璺宠浆琚烦杩囷紙宸查殣钘忥級锛岃烦杩囬涓嶇畻鈥滄湭浣滅瓟鈥�
+        .filter((q) => !q.raw.astrict && !this.hasOptionValue(q.raw));
     },
     callStatusText() {
       if (this.customCallStatus) {
@@ -2043,6 +2045,35 @@
         const newPos = start + text.length;
         target.setSelectionRange(newPos, newPos);
       });
+
+      // 蹇嵎璇寘鍚�滄浜♀�濇椂锛岃繃婊ゆ帓闄よ鎮h��
+      if (text && text.includes("姝讳骸")) {
+        this.filterDeathPatient(text);
+      }
+    },
+    // 蹇嵎璇寘鍚�滄浜♀�濇椂杩囨护鎺掗櫎鎮h�咃紙鍙傝�� discharge 椤垫偅鑰呰繃婊わ級
+    filterDeathPatient(text) {
+      this.$modal
+        .confirm(
+          "璇ュ揩鎹疯鍖呭惈鈥滄浜♀�濓紝纭灏嗚鎮h�呰繃婊ゆ帓闄ゅ悧锛熻繃婊ゅ悗璇ユ偅鑰呮墍鏈夎繘琛屼腑浠诲姟灏嗗叏閮ㄥ仠姝紝涓旀棤娉曞尮閰嶆柊鐨勯殢璁夸换鍔★紝璇疯皑鎱庢搷浣滐紒"
+        )
+        .then(() => {
+          particularpatient(this.patid).then((response) => {
+            const patient = response.data;
+            patient.isoperation = 2;
+            patient.notrequiredFlag = 1;
+            patient.notrequiredreason = text;
+            patient.filterDrname = store.getters.nickName;
+            alterpatient(patient).then((res) => {
+              if (res.code == 200) {
+                this.$modal.msgSuccess("鎮h�呰繃婊ゆ垚鍔�");
+              } else {
+                this.$modal.msgError("鎮h�呰繃婊ゅけ璐�");
+              }
+            });
+          });
+        })
+        .catch(() => {});
     },
     // 鑾峰彇闂嵎鏁版嵁
     getsearchrResults(id) {
@@ -2082,6 +2113,8 @@
           });
           this.taskname = res.data.taskName;
           this.overdata();
+          // 鏍规嵁宸蹭繚瀛樼瓟妗堝洖鏀鹃�夐」璺宠浆閫昏緫锛屾仮澶嶈璺宠繃棰樼洰鐨勯殣钘忕姸鎬�
+          this.restoreJumpState();
         }
       });
     },
@@ -3252,6 +3285,63 @@
         }
       });
     },
+    // 鏍规嵁宸蹭繚瀛樼瓟妗堝洖鏀锯�滈�夐」璺宠浆鈥濋�昏緫锛屾仮澶嶈璺宠繃棰樼洰鐨勯殣钘忕姸鎬侊紙astrict锛�
+    restoreJumpState() {
+      const list = this.tableDatatop;
+      if (!list || !list.length) return;
+
+      // 鍏堝叏閮ㄧ疆涓哄彲瑙�
+      list.forEach((item) => {
+        this.$set(item, "astrict", 0);
+        this.$set(item, "hiddenByEnd", false);
+      });
+
+      for (let i = 0; i < list.length; ) {
+        const q = list[i];
+        let jumped = false;
+
+        // 鍙湁鈥滃崟閫� + 鐢遍�夐」閰嶇疆璺宠浆鈥濅笖宸蹭綔绛旂殑棰樼洰鎵嶅彲鑳戒骇鐢熻烦杞�
+        if (q.branchFlag == 1 && q.scriptType == 1 && this.hasOptionValue(q)) {
+          const opt = (q.svyTaskTemplateTargetoptions || []).find(
+            (o) => o.optioncontent == q.scriptResult
+          );
+          const next = opt ? opt.nextQuestion : null;
+
+          if (next !== null && next !== undefined && next !== "") {
+            const targetNum = Number(next);
+
+            // 缁撴潫闂瓟锛氶殣钘忓悗闈㈡墍鏈夐
+            if (targetNum === 0) {
+              for (let j = i + 1; j < list.length; j++) {
+                this.$set(list[j], "astrict", 1);
+                this.$set(list[j], "hiddenByEnd", true);
+              }
+              break;
+            }
+
+            const target = targetNum - 1; // 杞� 0-indexed
+            if (target > i && target < list.length) {
+              // 闅愯棌褰撳墠棰樺拰鐩爣棰樹箣闂寸殑棰�
+              for (let j = i + 1; j < target; j++) {
+                this.$set(list[j], "astrict", 1);
+                this.$set(list[j], "hiddenByEnd", false);
+              }
+              // 鐩爣棰樹繚鎸佸彲瑙�
+              this.$set(list[target], "astrict", 0);
+              this.$set(list[target], "hiddenByEnd", false);
+              i = target;
+              jumped = true;
+            }
+          }
+        }
+
+        if (!jumped) {
+          i++;
+        }
+      }
+
+      this.$forceUpdate();
+    },
     // 鍒囨崲闅忚绫诲瀷鍚庯紝閲嶇疆鍖荤敓澶勭悊鎰忚鐨勬牎楠岀姸鎬侊紙蹇呭~鏉′欢闅忕被鍨嬪彉鍖栵級
     handleResourceChange() {
       this.$nextTick(() => {
diff --git a/src/views/index.vue b/src/views/index.vue
index 5697f38..53ddfc7 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -5,7 +5,12 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <!-- 灏辫瘖缁熻鐩掑瓙 -->
-          <div class="grid-content bg-purple headerBox bgc1">
+          <div
+            class="grid-content bg-purple headerBox bgc1"
+            v-loading="headerLoading"
+            element-loading-text="鍔犺浇涓�..."
+            element-loading-background="rgba(255, 255, 255, 0.55)"
+          >
             <div class="title">
               闂ㄨ瘖鏈嶅姟<span
                 style="
@@ -46,7 +51,12 @@
           </div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple headerBox bgc2">
+          <div
+            class="grid-content bg-purple headerBox bgc2"
+            v-loading="headerLoading"
+            element-loading-text="鍔犺浇涓�..."
+            element-loading-background="rgba(255, 255, 255, 0.55)"
+          >
             <div class="title">
               鍑洪櫌鏈嶅姟
               <span
@@ -104,7 +114,13 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <!-- echars鏁版嵁鍙鍖� -->
-          <div class="grid-content bg-purple" style="min-height: 365px">
+          <div
+            class="grid-content bg-purple"
+            style="min-height: 365px"
+            v-loading="chartLoading"
+            element-loading-text="鍥捐〃鏁版嵁鍔犺浇涓�..."
+            element-loading-background="rgba(255, 255, 255, 0.55)"
+          >
             <div class="title">
               鏈嶅姟缁熻
               <span>{{ endatd }} ~ {{ statd }}</span>
@@ -148,7 +164,13 @@
         </el-col>
         <!-- 鍙宠竟鍒楄〃 -->
         <el-col :span="4" class="aside">
-          <div class="grid-contentsa bg-purple" style="margin-top: -180px">
+          <div
+            class="grid-contentsa bg-purple"
+            style="margin-top: -180px"
+            v-loading="deptLoading"
+            element-loading-text="鍔犺浇涓�..."
+            element-loading-background="rgba(255, 255, 255, 0.55)"
+          >
             <div class="title">
               绉戝鏈嶅姟閲�
               <span>{{ endatd }} ~ {{ statd }}</span>
@@ -341,6 +363,9 @@
   name: "home",
   data() {
     return {
+      headerLoading: false, // 椤堕儴缁熻鍗″姞杞戒腑
+      chartLoading: false, // 鏈嶅姟缁熻瓒嬪娍鍥惧姞杞戒腑
+      deptLoading: false, // 绉戝鏈嶅姟閲忓姞杞戒腑
       NodeCount: "",
       PrtnerCount: "",
       NodeCount: "",
@@ -413,10 +438,10 @@
     },
   },
   created() {
+    // 鍚勫尯鍧楃嫭绔嬪姞杞斤紝loading 鐢卞悇鑷柟娉曞唴閮ㄧ鐞�
     this.getTopdata();
     this.getgraphdata();
-    // this.getranking();
-    this.$nextTick(function () {
+    this.$nextTick(() => {
       this.myEcharts2();
       this.getnodeCollect();
       this.getSkuTop();
@@ -481,17 +506,24 @@
     },
     // top鎺掕
     async getSkuTop() {
+      this.deptLoading = true;
       let Rankingdata = {
         startDate: this.endatd,
         endDate: this.statd,
         cy: 1,
       };
-      await getDeptRanking(Rankingdata).then((res) => {
-        if (res.code == 200) {
-          this.SkuTop = res.rows.sort((a, b) => b.rc - a.rc);
-          console.log(this.SkuTop, "this.SkuTop");
-        }
-      });
+      try {
+        await getDeptRanking(Rankingdata).then((res) => {
+          if (res.code == 200) {
+            this.SkuTop = res.rows.sort((a, b) => b.rc - a.rc);
+            console.log(this.SkuTop, "this.SkuTop");
+          }
+        });
+      } catch (e) {
+        console.error("鑾峰彇绉戝鎺掕澶辫触:", e);
+      } finally {
+        this.deptLoading = false;
+      }
 
       // this.SkuTop = [
       //   { amount: 0, count: 123, skuId: "0", skuName: "蹇冭偤绉�" },
@@ -513,6 +545,7 @@
     },
     // 鑾峰彇澶撮儴鏁版嵁
     getTopdata() {
+      this.headerLoading = true;
       let hospCountdata = {
         startDate: this.endatd,
         endDate: this.statd,
@@ -523,23 +556,27 @@
         endDate: this.statd,
         cy: 1,
       };
-      // 鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁�
-      getEChartsPatMedOuthospCount(hospCountdata).then((res) => {
-        if (res.code == 200) {
-          this.OutpatientData = res.data;
-        }
-      });
-      // 鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟
-      getechartsListCountdata(Countdata).then((res) => {
-        if (res.code == 200) {
-          this.DischargeData = res.data;
-        }
+      // 鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁� / 鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟
+      return Promise.all([
+        getEChartsPatMedOuthospCount(hospCountdata).then((res) => {
+          if (res.code == 200) {
+            this.OutpatientData = res.data;
+          }
+        }),
+        getechartsListCountdata(Countdata).then((res) => {
+          if (res.code == 200) {
+            this.DischargeData = res.data;
+          }
+        }),
+      ]).finally(() => {
+        this.headerLoading = false;
       });
     },
     // 鑾峰彇涓儴绾挎煴鍥炬暟鎹�
     getranking() {},
 
     async getgraphdata() {
+      this.chartLoading = true;
       let params = {
         startDate: this.endatd,
         endDate: this.statd,
@@ -550,9 +587,12 @@
         const res = await getServiceStatistics(params);
         if (res.code === 200) {
           this.processChartData(res.data);
+        } else {
+          this.chartLoading = false;
         }
       } catch (error) {
         console.error("鑾峰彇鍥捐〃鏁版嵁澶辫触:", error);
+        this.chartLoading = false;
       }
     },
 
@@ -660,6 +700,7 @@
       };
 
       this.myChart2.setOption(option);
+      this.chartLoading = false;
     },
 
     // 璁$畻鏈�浼樼殑interval鍊�
@@ -1213,3 +1254,25 @@
   background-color: #f9fafc;
 }
 </style>
+
+<style>
+/* 棣栭〉鍒嗗潡鍔犺浇鍔ㄧ敾锛氭洿杞婚噺銆佹洿娓呯埥鐨� loading */
+.home .el-loading-mask {
+  background-color: rgba(255, 255, 255, 0.55);
+}
+.home .el-loading-spinner {
+  top: 50%;
+  margin-top: -25px;
+  width: 100%;
+  text-align: center;
+}
+.home .el-loading-spinner .el-icon-loading {
+  font-size: 30px;
+  color: #409eff;
+}
+.home .el-loading-spinner .el-loading-text {
+  margin-top: 8px;
+  color: #606266;
+  font-size: 13px;
+}
+</style>
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 3f34e32..b3bcb46 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -36,30 +36,29 @@
           :model="ruleForm"
           :rules="rules"
           ref="ruleForm"
-          label-width="180px"
+          label-width="120px"
           class="demo-ruleForm"
         >
           <el-form-item label="闂嵎鍚嶇О" prop="svyname">
-            <div style="width: 55vw">
-              <el-input v-model="ruleForm.svyname"></el-input>
-            </div>
+            <el-input
+              v-model="ruleForm.svyname"
+              placeholder="璇疯緭鍏ラ棶鍗峰悕绉�"
+            ></el-input>
           </el-form-item>
           <el-form-item label="闂嵎鎻忚堪" prop="description">
             <el-input
-              style="width: 55vw"
               type="textarea"
-              :rows="2"
-              placeholder="璇疯緭鍏ュ唴瀹�"
+              :rows="3"
+              placeholder="璇疯緭鍏ラ棶鍗锋弿杩�"
               v-model="ruleForm.description"
             >
-            </el-input
-          ></el-form-item>
+            </el-input>
+          </el-form-item>
           <el-row :gutter="20">
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="闂嵎鍒嗙被" prop="categoryid">
                 <el-select
                   v-model="ruleForm.categoryid"
-                  size="medium"
                   filterable
                   placeholder="璇烽�夋嫨鍒嗙被"
                 >
@@ -79,11 +78,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="璇勪环绫诲瀷" prop="scoreType">
                 <el-select
                   v-model="ruleForm.scoreType"
-                  placeholder="璇烽�夋嫨鍒嗙被"
+                  placeholder="璇烽�夋嫨璇勪环绫诲瀷"
                 >
                   <el-option
                     v-for="group in appraiselist"
@@ -97,19 +96,20 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="鍙敤鐘舵��" prop="isenable">
                 <el-radio-group v-model="ruleForm.isenable">
                   <el-radio
                     v-for="(item, index) in usable"
+                    :key="index"
                     :label="item.value"
                     >{{ item.label }}</el-radio
                   >
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="鐗堟湰鍙�" prop="name">
+            <el-col :span="12">
+              <el-form-item label="鐗堟湰鍙�" prop="version">
                 <el-input
                   v-model="ruleForm.version"
                   placeholder="榛樿1.0"
@@ -209,14 +209,11 @@
           <el-form-item label="闂嵎鏂瑰紡" prop="suitway">
             <el-select
               v-model="ruleForm.suitway"
-              style="width: 55vw"
-              size="medium"
               multiple
               filterable
-              placeholder="璇烽�夋嫨鍒嗙被"
+              placeholder="璇烽�夋嫨闂嵎鏂瑰紡"
             >
               <el-option
-                class="ruleFormaa"
                 v-for="item in mode"
                 :key="item.value"
                 :label="item.label"
@@ -226,20 +223,17 @@
             </el-select>
           </el-form-item>
 
-          <el-row>
-            <el-col :span="20"
+          <el-row :gutter="20">
+            <el-col :span="12"
               ><el-form-item label="閫傜敤绉戝" prop="region">
                 <el-select
                   v-model="tempDetpRelevanceslist"
                   @remove-tag="removetag"
-                  style="width: 55vw"
-                  size="medium"
                   multiple
                   filterable
                   placeholder="璇烽�夋嫨绉戝"
                 >
                   <el-option
-                    class="ruleFormaa"
                     v-for="item in flatArray"
                     :key="item.id"
                     :label="item.label"
@@ -248,21 +242,16 @@
                   </el-option>
                 </el-select> </el-form-item
             ></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="20"
+            <el-col :span="12"
               ><el-form-item label="閫傜敤鐥呭尯" prop="region">
                 <el-select
                   v-model="tempbelongWards"
                   @remove-tag="removehpsp"
-                  style="width: 55vw"
-                  size="medium"
                   multiple
                   filterable
                   placeholder="璇烽�夋嫨鐥呭尯"
                 >
                   <el-option
-                    class="ruleFormaa"
                     v-for="item in flatArray"
                     :key="item.id"
                     :label="item.label"
@@ -274,15 +263,13 @@
           </el-row>
           <el-form-item label="缁撴潫璇�" prop="conclusion">
             <el-input
-              style="width: 55vw; line-height: 80px"
               type="textarea"
-              :rows="5"
-              autosize
-              placeholder="璇疯緭鍏ュ唴瀹�"
+              :rows="4"
+              placeholder="璇疯緭鍏ョ粨鏉熻"
               v-model="ruleForm.conclusion"
             >
-            </el-input
-          ></el-form-item>
+            </el-input>
+          </el-form-item>
 
           <el-form-item>
             <el-button type="success" @click="nextstep('ruleForm')"
@@ -2120,6 +2107,14 @@
     handleUpdate(row) {
       this.topicobj = row;
       this.radioas = "";
+      // 纭繚姣忎釜閫夐」鐨� nextQuestion 鏄搷搴斿紡灞炴�э紝鍚﹀垯鈥滀笅棰樿烦杞�(搴忓彿)鈥濊緭鍏ュ悗涓嶅埛鏂�
+      (row.svyLibTemplateTargetoptions || []).forEach((item) => {
+        this.$set(
+          item,
+          "nextQuestion",
+          item.nextQuestion == null ? "" : item.nextQuestion
+        );
+      });
       // getissuelist({ svyid: row.svyid }).then((res) => {
       // });
     },
@@ -2151,7 +2146,7 @@
         }
         if (item.svyLibTemplateTargetoptions) {
           item.svyLibTemplateTargetoptions.forEach((items) => {
-            items.nextQuestion = Number(item.sort) + 1;
+            this.$set(items, "nextQuestion", Number(item.sort) + 1);
           });
         }
       });
@@ -2630,6 +2625,7 @@
   padding: 20px;
   background: #edf1f7;
   border: 1px solid #dcdfe6;
+  border-radius: 8px;
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
 }
@@ -2645,6 +2641,7 @@
   margin-top: 10px;
   background: #ffff;
   border: 1px solid #dcdfe6;
+  border-radius: 8px;
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
 
@@ -3063,4 +3060,14 @@
 //   line-height: 36px;
 //   display: flex;
 // }
+
+.demo-ruleForm {
+  max-width: 1100px;
+
+  .el-select,
+  .el-input,
+  .el-textarea {
+    width: 100%;
+  }
+}
 </style>
diff --git a/src/views/login.vue b/src/views/login.vue
index 1b23cef..3bd8f55 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -186,7 +186,7 @@
         if (res.code == 200) {
           // 鍚屽痉绯诲垪 / 鍗楀崕绯诲垪 / 娴欐睙鐪佹柊鍗庡尰闄細鐢� campusid(organizationID) 浣滀笅鎷夐敭鍊硷紱
           // 鍏朵綑锛堜附姘村尯鍩� organizationID 鍏ㄤ负 "1" 涓嶅敮涓�锛夛細鐢� orgid 浣滀笅鎷夐敭鍊�
-          const campusidKeywords = ["鍚屽痉", "鍗楀崕", "娴欐睙鐪佹柊鍗庡尰闄�"];
+          const campusidKeywords = ["鍚屽痉", "鍗楀崕", "娴欐睙鐪佹柊鍗庡尰闄�", "鏉窞甯傜涓�浜烘皯鍖婚櫌"];
           this.options = (res.rows || []).map((item) => {
             console.log(item.organizationName);
 
diff --git a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
index 1e2b17e..18b247a 100644
--- a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
+++ b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
@@ -454,6 +454,7 @@
           :show-overflow-tooltip="true"
         />
         <el-table-column
+          v-if="!isTongdeOrg"
           label="鍑洪櫌浜烘"
           align="center"
           key="dischargeCount"
@@ -475,7 +476,60 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column v-if="isTongdeOrg" label="鍑洪櫌浜烘" align="center">
+          <el-table-column
+            label="鏅��"
+            align="center"
+            width="80"
+            key="dischargeCountNormal"
+            prop="dischargeCountNormal"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="
+                  handleViewDetails(
+                    scope.row,
+                    'dischargeCountNormalInfo',
+                    '鍑洪櫌鎮h�呭垪琛�-鏅��'
+                  )
+                "
+              >
+                <span class="button-zx">{{
+                  scope.row.dischargeCountNormal
+                }}</span>
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鏃ラ棿"
+            align="center"
+            width="80"
+            key="dischargeCountDaytime"
+            prop="dischargeCountDaytime"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="
+                  handleViewDetails(
+                    scope.row,
+                    'dischargeCountDaytimeInfo',
+                    '鍑洪櫌鎮h�呭垪琛�-鏃ラ棿'
+                  )
+                "
+              >
+                <span class="button-zx">{{
+                  scope.row.dischargeCountDaytime
+                }}</span>
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table-column>
         <el-table-column
+          v-if="!isTongdeOrg"
           label="鏃犻渶闅忚浜烘"
           align="center"
           width="100"
@@ -494,7 +548,58 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column v-if="isTongdeOrg" label="鏃犻渶闅忚浜烘" align="center">
+          <el-table-column
+            label="鏅��"
+            align="center"
+            width="80"
+            key="nonFollowUpNormal"
+            prop="nonFollowUpNormal"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="
+                  handleViewDetails(
+                    scope.row,
+                    'nonFollowUpNormalInfo',
+                    '鏃犻渶闅忚鍒楄〃-鏅��'
+                  )
+                "
+              >
+                <span class="button-zx">{{ scope.row.nonFollowUpNormal }}</span>
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鏃ラ棿"
+            align="center"
+            width="80"
+            key="nonFollowUpDaytime"
+            prop="nonFollowUpDaytime"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="
+                  handleViewDetails(
+                    scope.row,
+                    'nonFollowUpDaytimeInfo',
+                    '鏃犻渶闅忚鍒楄〃-鏃ラ棿'
+                  )
+                "
+              >
+                <span class="button-zx">{{
+                  scope.row.nonFollowUpDaytime
+                }}</span>
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table-column>
         <el-table-column
+          v-if="!isTongdeOrg"
           label="搴旈殢璁夸汉娆�"
           align="center"
           width="100"
@@ -512,6 +617,58 @@
               <span class="button-zx">{{ scope.row.followUpNeeded }}</span>
             </el-button>
           </template>
+        </el-table-column>
+        <el-table-column v-if="isTongdeOrg" label="搴旈殢璁夸汉娆�" align="center">
+          <el-table-column
+            label="鏅��"
+            align="center"
+            width="80"
+            key="followUpNeededNormal"
+            prop="followUpNeededNormal"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="
+                  handleViewDetails(
+                    scope.row,
+                    'followUpNeededNormalInfo',
+                    '搴旈殢璁垮垪琛�-鏅��'
+                  )
+                "
+              >
+                <span class="button-zx">{{
+                  scope.row.followUpNeededNormal
+                }}</span>
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鏃ラ棿"
+            align="center"
+            width="80"
+            key="followUpNeededDaytime"
+            prop="followUpNeededDaytime"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="
+                  handleViewDetails(
+                    scope.row,
+                    'followUpNeededDaytimeInfo',
+                    '搴旈殢璁垮垪琛�-鏃ラ棿'
+                  )
+                "
+              >
+                <span class="button-zx">{{
+                  scope.row.followUpNeededDaytime
+                }}</span>
+              </el-button>
+            </template>
+          </el-table-column>
         </el-table-column>
 
         <el-table-column align="center" label="棣栨鍑洪櫌闅忚">
@@ -2095,15 +2252,48 @@
       };
       // 鏄惁涓虹洰鏍囧尰闄紙浜哄伐/璇煶/鐭俊/寰俊 鎸� 鍙戦�佹暟/鎴愬姛鏁� 鍒嗙骇灞曠ず锛�
       const graded = this.isTargetHospital;
+      // 缂欎簯鍘夸汉姘戝尰闄㈤澶栧睍绀衡�滃強鏃堕殢璁夸汉娆♀�濆垪
+      const showTimelyFollowUp = this.orgname == "缂欎簯鍘夸汉姘戝尰闄�";
+      // 鍚屽痉绯诲垪锛氬嚭闄汉娆�/鏃犻渶闅忚浜烘/搴旈殢璁夸汉娆� 涓嬪垎鈥滄櫘閫�/鏃ラ棿鈥�
+      const showTongdeBreakdown = this.isTongdeOrg;
 
-      const baseHeaders = [
-        "",
-        "鍑洪櫌鐥呭尯",
-        "绉戝",
-        "鍑洪櫌浜烘",
-        "鏃犻渶闅忚浜烘",
-        "搴旈殢璁夸汉娆�",
-      ];
+      // 鍩虹鍒楋細鍥哄畾鍒楋紙绌�/鍑洪櫌鐥呭尯/绉戝锛�+ 浜烘鍒嗙粍鍒楋紙鍚屽痉绯诲垪涓嬪垎鏅��/鏃ラ棿锛�
+      const baseFixedHeaders = ["", "鍑洪櫌鐥呭尯", "绉戝"];
+      const baseCountGroups = showTongdeBreakdown
+        ? [
+            {
+              label: "鍑洪櫌浜烘",
+              fields: ["dischargeCountNormal", "dischargeCountDaytime"],
+              sub: ["鏅��", "鏃ラ棿"],
+            },
+            {
+              label: "鏃犻渶闅忚浜烘",
+              fields: ["nonFollowUpNormal", "nonFollowUpDaytime"],
+              sub: ["鏅��", "鏃ラ棿"],
+            },
+            {
+              label: "搴旈殢璁夸汉娆�",
+              fields: ["followUpNeededNormal", "followUpNeededDaytime"],
+              sub: ["鏅��", "鏃ラ棿"],
+            },
+          ]
+        : [
+            { label: "鍑洪櫌浜烘", fields: ["dischargeCount"], sub: ["鍑洪櫌浜烘"] },
+            {
+              label: "鏃犻渶闅忚浜烘",
+              fields: ["nonFollowUp"],
+              sub: ["鏃犻渶闅忚浜烘"],
+            },
+            {
+              label: "搴旈殢璁夸汉娆�",
+              fields: ["followUpNeeded"],
+              sub: ["搴旈殢璁夸汉娆�"],
+            },
+          ];
+      const baseFields = baseCountGroups.reduce(
+        (arr, g) => arr.concat(g.fields),
+        []
+      );
       const coreHeaders = this.isTargetHospital
         ? [
             "闇�闅忚",
@@ -2122,18 +2312,19 @@
             "鎴愬姛鐜�",
             "闅忚鐜�",
             "鍙婃椂鐜�",
+            ...(showTimelyFollowUp ? ["鍙婃椂闅忚浜烘"] : []),
           ];
       const methodGroups = this.getMethodColumns();
 
-      const baseCount = baseHeaders.length; // 6
-      const coreCount = coreHeaders.length; // 7
+      const baseCount = baseFixedHeaders.length + baseFields.length; // 6 鎴� 9
+      const coreCount = coreHeaders.length; // 7 鎴� 8
       const methodLeafCount = methodGroups.reduce(
         (sum, g) => sum + g.fields.length,
         0
       ); // 8 鎴� 4
-      const totalCols = baseCount + coreCount + methodLeafCount; // 21 鎴� 17
-      const coreStartCol = baseCount + 1; // 7
-      const methodStartCol = baseCount + coreCount + 1; // 14
+      const totalCols = baseCount + coreCount + methodLeafCount;
+      const coreStartCol = baseCount + 1;
+      const methodStartCol = baseCount + coreCount + 1;
 
       const titleText = `${serviceTypeName}缁熻琛╛${sheetNameSuffix}`;
       // 娣诲姞鏍囬琛�
@@ -2148,12 +2339,20 @@
         const headerEndRow = 4;
 
         // 绗�2琛岋細鍩虹鍒楃旱鍚戝悎骞� + 闅忚鍒嗙粍妯悜鍚堝苟
-        for (let i = 1; i <= baseCount; i++) {
+        for (let i = 1; i <= baseFixedHeaders.length; i++) {
           worksheet.mergeCells(2, i, headerEndRow, i);
           const cell = worksheet.getCell(2, i);
-          cell.value = baseHeaders[i - 1];
+          cell.value = baseFixedHeaders[i - 1];
           cell.style = headerStyle;
         }
+        let bCol = baseFixedHeaders.length + 1;
+        baseCountGroups.forEach((g) => {
+          worksheet.mergeCells(2, bCol, headerEndRow, bCol);
+          const cell = worksheet.getCell(2, bCol);
+          cell.value = g.label;
+          cell.style = headerStyle;
+          bCol += g.fields.length;
+        });
         worksheet.mergeCells(2, coreStartCol, 2, totalCols);
         worksheet.getCell(2, coreStartCol).value = serviceTypeName;
         worksheet.getCell(2, coreStartCol).style = headerStyle;
@@ -2218,12 +2417,35 @@
         // 琛ㄥご鍗� 2 琛岋紙绗�2/3琛岋級锛屾暟鎹粠绗�4琛屽紑濮�
         const headerEndRow = 3;
 
-        for (let i = 1; i <= baseCount; i++) {
+        // 鍥哄畾鍒楋紙绌�/鍑洪櫌鐥呭尯/绉戝锛夛細绾靛悜鍚堝苟
+        for (let i = 1; i <= baseFixedHeaders.length; i++) {
           worksheet.mergeCells(2, i, headerEndRow, i);
           const cell = worksheet.getCell(2, i);
-          cell.value = baseHeaders[i - 1];
+          cell.value = baseFixedHeaders[i - 1];
           cell.style = headerStyle;
         }
+        // 浜烘鍒嗙粍鍒楋細鍗曠骇绾靛悜鍚堝苟锛涘绾э紙鏅��/鏃ラ棿锛夌埗鏍囩妯悎銆佸瓙鏍囩鍐欑3琛�
+        let bCol = baseFixedHeaders.length + 1;
+        baseCountGroups.forEach((g) => {
+          if (g.sub.length > 1) {
+            worksheet.mergeCells(2, bCol, 2, bCol + g.sub.length - 1);
+            const cell = worksheet.getCell(2, bCol);
+            cell.value = g.label;
+            cell.style = headerStyle;
+            g.sub.forEach((sub, idx) => {
+              const subCell = worksheet.getCell(3, bCol + idx);
+              subCell.value = sub;
+              subCell.style = headerStyle;
+            });
+            bCol += g.sub.length;
+          } else {
+            worksheet.mergeCells(2, bCol, headerEndRow, bCol);
+            const cell = worksheet.getCell(2, bCol);
+            cell.value = g.label;
+            cell.style = headerStyle;
+            bCol += 1;
+          }
+        });
         worksheet.mergeCells(2, coreStartCol, 2, totalCols);
         worksheet.getCell(2, coreStartCol).value = serviceTypeName;
         worksheet.getCell(2, coreStartCol).style = headerStyle;
@@ -2253,9 +2475,7 @@
           "",
           item.leavehospitaldistrictname || "",
           item.deptname || "",
-          item.dischargeCount || 0,
-          item.nonFollowUp || 0,
-          item.followUpNeeded || 0,
+          ...baseFields.map((field) => item[field] || 0),
           item.needFollowUp || 0,
           // 寰呴殢璁匡細鐩爣鍖婚櫌鎷嗕负寰呭彂閫�/宸插彂閫侊紝鍏朵粬鐢ㄥ緟闅忚
           ...(this.isTargetHospital
@@ -2272,6 +2492,7 @@
           ),
           item.followUpRate || "0%", // 闅忚鐜�
           this.getTimelyRateText(item), // 鍙婃椂鐜�
+          ...(showTimelyFollowUp ? [item.timelyFollowUp || 0] : []), // 鍙婃椂闅忚浜烘
         ];
         methodGroups.forEach((g) => {
           g.fields.forEach((field) => {
@@ -2298,7 +2519,14 @@
       summaryRow.height = 28;
 
       // 鍒楀
-      const widths = [8, 20, 15, 12, 12, 12, 10, 10, 10, 10, 12, 12, 12];
+      const widths = [8, 20, 15];
+      baseCountGroups.forEach((g) => {
+        g.sub.forEach(() => widths.push(10));
+      });
+      widths.push(10, 10, 10, 10, 12, 12, 12);
+      if (showTimelyFollowUp) {
+        widths.push(12);
+      }
       methodGroups.forEach((g) => {
         g.fields.forEach(() => widths.push(8));
       });
@@ -2339,42 +2567,69 @@
     },
 
     getExportSummaries() {
-      const summaries = [
-        "鍚堣",
-        "/",
-        "/",
-        0, // 3: dischargeCount
-        0, // 4: nonFollowUp
-        0, // 5: followUpNeeded
-        0, // 6: needFollowUp
-        0, // 7: 寰呭彂閫�/寰呴殢璁�
-        0, // 8: 宸插彂閫�/闅忚鎴愬姛
-        0, // 9: 闅忚鎴愬姛/闅忚澶辫触
-        "0%", // 10: 鎴愬姛鐜�
-        "0%", // 11: 闅忚鐜�
-        "0%", // 12: 鍙婃椂鐜�
-      ];
+      const graded = this.isTargetHospital;
+      const showTimelyFollowUp = this.orgname == "缂欎簯鍘夸汉姘戝尰闄�";
+      const showTongdeBreakdown = this.isTongdeOrg;
+
+      const baseFields = showTongdeBreakdown
+        ? [
+            "dischargeCountNormal",
+            "dischargeCountDaytime",
+            "nonFollowUpNormal",
+            "nonFollowUpDaytime",
+            "followUpNeededNormal",
+            "followUpNeededDaytime",
+          ]
+        : ["dischargeCount", "nonFollowUp", "followUpNeeded"];
 
       const methodFields = this.getMethodColumns().reduce(
         (arr, g) => arr.concat(g.fields),
         []
       );
-      const methodStartIndex = 13;
+
+      // 鍒椾綅缃細0=鍚堣 1=/ 2=/锛岄殢鍚庝负鍩虹浜烘鍒椼�佹牳蹇冨垪銆佸強鏃堕殢璁夸汉娆★紙鍙�夛級銆侀殢璁挎柟寮忓垪
+      const baseStart = 3;
+      const needIdx = baseStart + baseFields.length; // 闇�闅忚
+      const pendingIdx = needIdx + 1; // 寰呴殢璁� / 寰呭彂閫�
+      const pending2Idx = graded ? pendingIdx + 1 : -1; // 宸插彂閫侊紙浠呯洰鏍囧尰闄級
+      const successIdx = pending2Idx >= 0 ? pending2Idx + 1 : pendingIdx + 1; // 闅忚鎴愬姛
+      const failIdx = graded ? -1 : successIdx + 1; // 闅忚澶辫触锛堥潪鐩爣鍖婚櫌锛�
+      const successRateIdx = (failIdx >= 0 ? failIdx : successIdx) + 1; // 鎴愬姛鐜�
+      const followUpRateIdx = successRateIdx + 1; // 闅忚鐜�
+      const timelyRateIdx = followUpRateIdx + 1; // 鍙婃椂鐜�
+      const timelyFollowUpIdx = showTimelyFollowUp ? timelyRateIdx + 1 : -1; // 鍙婃椂闅忚浜烘
+      const methodStartIndex =
+        (timelyFollowUpIdx >= 0 ? timelyFollowUpIdx : timelyRateIdx) + 1;
+
+      const summaries = ["鍚堣", "/", "/"];
+      baseFields.forEach(() => summaries.push(0));
+      summaries.push(0); // 闇�闅忚
+      summaries.push(0); // 寰呴殢璁� / 寰呭彂閫�
+      if (graded) summaries.push(0); // 宸插彂閫�
+      summaries.push(0); // 闅忚鎴愬姛
+      if (!graded) summaries.push(0); // 闅忚澶辫触
+      summaries.push("0%"); // 鎴愬姛鐜�
+      summaries.push("0%"); // 闅忚鐜�
+      summaries.push("0%"); // 鍙婃椂鐜�
+      if (showTimelyFollowUp) summaries.push(0); // 鍙婃椂闅忚浜烘
       methodFields.forEach(() => summaries.push(0));
 
       this.tableData.forEach((item) => {
-        summaries[3] += Number(item.dischargeCount) || 0;
-        summaries[4] += Number(item.nonFollowUp) || 0;
-        summaries[5] += Number(item.followUpNeeded) || 0;
-        summaries[6] += Number(item.needFollowUp) || 0;
-        if (this.isTargetHospital) {
-          summaries[7] += Number(item.pendingFollowUpWaitSend) || 0;
-          summaries[8] += Number(item.pendingFollowUpSent) || 0;
-          summaries[9] += Number(item.followUpSuccess) || 0;
+        baseFields.forEach((field, i) => {
+          summaries[baseStart + i] += Number(item[field]) || 0;
+        });
+        summaries[needIdx] += Number(item.needFollowUp) || 0;
+        if (graded) {
+          summaries[pendingIdx] += Number(item.pendingFollowUpWaitSend) || 0;
+          summaries[pending2Idx] += Number(item.pendingFollowUpSent) || 0;
+          summaries[successIdx] += Number(item.followUpSuccess) || 0;
         } else {
-          summaries[7] += Number(item.pendingFollowUp) || 0;
-          summaries[8] += Number(item.followUpSuccess) || 0;
-          summaries[9] += Number(item.followUpFail) || 0;
+          summaries[pendingIdx] += Number(item.pendingFollowUp) || 0;
+          summaries[successIdx] += Number(item.followUpSuccess) || 0;
+          summaries[failIdx] += Number(item.followUpFail) || 0;
+        }
+        if (showTimelyFollowUp) {
+          summaries[timelyFollowUpIdx] += Number(item.timelyFollowUp) || 0;
         }
         methodFields.forEach((field, i) => {
           summaries[methodStartIndex + i] += Number(item[field]) || 0;
@@ -2382,17 +2637,16 @@
       });
 
       // 鎴愬姛鐜囪绠楋細闅忚鎴愬姛 / 闇�闅忚锛堢洰鏍囧尰闄級锛屽惁鍒� 闅忚鎴愬姛 / (闇�闅忚-寰呴殢璁�)
-      const totalSuccess = this.isTargetHospital ? summaries[9] : summaries[8];
-      const totalNeed = summaries[6]; // needFollowUp鐨勬�诲拰
-      const totalPending = summaries[7]; // 寰呭彂閫�/寰呴殢璁跨殑鎬诲拰
-      const denominator = this.isTargetHospital
-        ? totalNeed
-        : totalNeed - totalPending;
+      const totalSuccess = summaries[successIdx];
+      const totalNeed = summaries[needIdx];
+      const totalPending = summaries[pendingIdx];
+      const denominator = graded ? totalNeed : totalNeed - totalPending;
 
       if (denominator > 0) {
-        summaries[10] = ((totalSuccess / denominator) * 100).toFixed(2) + "%";
+        summaries[successRateIdx] =
+          ((totalSuccess / denominator) * 100).toFixed(2) + "%";
       } else {
-        summaries[10] = "0.00%";
+        summaries[successRateIdx] = "0.00%";
       }
 
       // 闅忚鐜囪绠�
@@ -2404,16 +2658,19 @@
         const avgFollowUpRate =
           followUpRateValues.reduce((sum, val) => sum + val, 0) /
           followUpRateValues.length;
-        summaries[11] = (avgFollowUpRate * 100).toFixed(2) + "%";
+        summaries[followUpRateIdx] = (avgFollowUpRate * 100).toFixed(2) + "%";
       }
 
       // 鍙婃椂鐜囪绠楋細鐩爣鍖婚櫌 (闇�闅忚-浜哄伐瓒呮椂)/闇�闅忚锛屽叾浠栧彇鍚庣 rate 骞冲潎
-      if (this.isTargetHospital) {
+      if (graded) {
         const totalTimeout = this.tableData.reduce(
           (sum, item) => sum + (Number(item.manualCallTimeout) || 0),
           0
         );
-        summaries[12] = this.calculateTimelyRate(totalNeed, totalTimeout);
+        summaries[timelyRateIdx] = this.calculateTimelyRate(
+          totalNeed,
+          totalTimeout
+        );
       } else {
         const rateValues = this.tableData
           .map((item) => this.extractPercentageValue(item.rate))
@@ -2422,14 +2679,22 @@
         if (rateValues.length > 0) {
           const avgRate =
             rateValues.reduce((sum, val) => sum + val, 0) / rateValues.length;
-          summaries[12] = (avgRate * 100).toFixed(2) + "%";
+          summaries[timelyRateIdx] = (avgRate * 100).toFixed(2) + "%";
         }
       }
 
       // 鏍煎紡鍖栨暟瀛�
-      const numericIndices = [3, 4, 5, 6, 7, 8, 9].concat(
-        methodFields.map((_, i) => methodStartIndex + i)
-      );
+      const numericIndices = [];
+      for (let i = baseStart; i < baseStart + baseFields.length; i++) {
+        numericIndices.push(i);
+      }
+      numericIndices.push(needIdx, pendingIdx);
+      if (graded) numericIndices.push(pending2Idx);
+      numericIndices.push(successIdx);
+      if (!graded) numericIndices.push(failIdx);
+      if (showTimelyFollowUp) numericIndices.push(timelyFollowUpIdx);
+      methodFields.forEach((_, i) => numericIndices.push(methodStartIndex + i));
+
       numericIndices.forEach((index) => {
         summaries[index] = this.formatNumber(summaries[index]);
       });
diff --git a/vue.config.js b/vue.config.js
index 06f608c..4f71276 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,13 +37,13 @@
       [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://192.168.100.168:8095`,
         // target:`http://35z1t16164.qicp.vip`,
-        // target: `http://220.66.153.137:8095`,
+        // target: `http://220.66.154.95:8095`,
         // target: `http://192.168.100.10:8089`,//鍗楀崕
         // target: `https://9.208.38.93:8092/`,
         changeOrigin: true,

--
Gitblit v1.9.3