From dc67d3d0a3ee964e9bfffccf825780357bb6ec33 Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Tue, 23 Dec 2025 12:00:02 +0800
Subject: [PATCH] feat: 优化统计接口和会员信息接口

---
 antis-ncc-admin/src/views/departmentConsumePerformanceStatistics/index.vue                            |   4 ++--
 antis-ncc-admin/src/views/goldTriangleStatistics/index.vue                                            |   5 +----
 antis-ncc-admin/src/views/storeConsumePerformanceStatistics/index.vue                                 |   2 +-
 antis-ncc-admin/src/views/techPerformanceStatistics/index.vue                                         |   8 ++++----
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbUpdateFileInput.cs            |  12 +++++++++++-
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs                       |   9 +++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs                       |   5 +++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/GoddessCardMemberListQueryInput.cs  |  12 ++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LeadCustomerStatisticsListOutput.cs |  25 +++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs                                          |  64 +++++++++++++++++++++++++++++++++++++++++++++-------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs                                             |  64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs                                       | 746 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------
 接口调用说明-修改开单信息.md                                                              | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 1002 insertions(+), 155 deletions(-)
 create mode 100644 接口调用说明-修改开单信息.md

diff --git a/antis-ncc-admin/src/views/departmentConsumePerformanceStatistics/index.vue b/antis-ncc-admin/src/views/departmentConsumePerformanceStatistics/index.vue
index d42b42d..05c12f4 100644
--- a/antis-ncc-admin/src/views/departmentConsumePerformanceStatistics/index.vue
+++ b/antis-ncc-admin/src/views/departmentConsumePerformanceStatistics/index.vue
@@ -41,9 +41,9 @@
 
         <!-- 表格卡片 -->
         <el-card class="table-card">
-            <div slot="header" class="clearfix">
+            <!-- <div slot="header" class="clearfix">
                 <span><i class="el-icon-s-grid"></i> 个人消耗业绩列表</span>
-            </div>
+            </div> -->
             <div class="table-container">
                 <el-table :data="tableData" v-loading="loading" element-loading-text="加载中..." :height="tableHeight"
                     border stripe style="width: 100%">
diff --git a/antis-ncc-admin/src/views/goldTriangleStatistics/index.vue b/antis-ncc-admin/src/views/goldTriangleStatistics/index.vue
index d3756a6..a0990f7 100644
--- a/antis-ncc-admin/src/views/goldTriangleStatistics/index.vue
+++ b/antis-ncc-admin/src/views/goldTriangleStatistics/index.vue
@@ -36,13 +36,10 @@
 
         <!-- 表格卡片 -->
         <el-card class="table-card">
-            <div slot="header" class="clearfix">
-                <span><i class="el-icon-s-grid"></i> 金三角开卡业绩列表</span>
-            </div>
             <div class="table-container">
                 <el-table :data="tableData" v-loading="loading" element-loading-text="加载中..." :height="tableHeight"
                     border stripe style="width: 100%">
-                    <el-table-column prop="GoldTriangleName" label="金三角战队" width="150" fixed="left"></el-table-column>
+                    <el-table-column prop="GoldTriangleName" label="金三角战队" fixed="left"></el-table-column>
                     <el-table-column prop="StoreName" label="门店名称" width="150" fixed="left"></el-table-column>
                     <el-table-column prop="OrderCount" label="订单数量" width="100" align="right"></el-table-column>
                     <el-table-column prop="TotalPerformance" label="总业绩金额" width="120" align="right">
diff --git a/antis-ncc-admin/src/views/storeConsumePerformanceStatistics/index.vue b/antis-ncc-admin/src/views/storeConsumePerformanceStatistics/index.vue
index b94c101..b93d60b 100644
--- a/antis-ncc-admin/src/views/storeConsumePerformanceStatistics/index.vue
+++ b/antis-ncc-admin/src/views/storeConsumePerformanceStatistics/index.vue
@@ -37,7 +37,7 @@
             <div class="table-container">
                 <el-table :data="tableData" v-loading="loading" element-loading-text="加载中..." :height="tableHeight"
                     border stripe style="width: 100%">
-                    <el-table-column prop="StoreName" label="门店名称" width="200" fixed="left"></el-table-column>
+                    <el-table-column prop="StoreName" label="门店名称" fixed="left"></el-table-column>
                     <el-table-column prop="TotalPerformance" label="总业绩" width="120" align="right">
                         <template slot-scope="scope">
                             {{ formatMoney(scope.row.TotalPerformance) }}
diff --git a/antis-ncc-admin/src/views/techPerformanceStatistics/index.vue b/antis-ncc-admin/src/views/techPerformanceStatistics/index.vue
index 006cf8c..5d9297a 100644
--- a/antis-ncc-admin/src/views/techPerformanceStatistics/index.vue
+++ b/antis-ncc-admin/src/views/techPerformanceStatistics/index.vue
@@ -36,14 +36,14 @@
 
         <!-- 表格卡片 -->
         <el-card class="table-card">
-            <div slot="header" class="clearfix">
+            <!-- <div slot="header" class="clearfix">
                 <span><i class="el-icon-s-grid"></i> 科技部开单业绩列表</span>
-            </div>
+            </div> -->
             <div class="table-container">
                 <el-table :data="tableData" v-loading="loading" element-loading-text="加载中..." :height="tableHeight"
                     border stripe style="width: 100%">
-                    <el-table-column prop="TeacherName" label="老师姓名" width="120" fixed="left"></el-table-column>
-                    <el-table-column prop="StoreName" label="门店名称" width="150" fixed="left"></el-table-column>
+                    <el-table-column prop="TeacherName" label="老师姓名" fixed="left"></el-table-column>
+                    <!-- <el-table-column prop="StoreName" label="门店名称" width="150" fixed="left"></el-table-column> -->
                     <el-table-column prop="TotalPerformance" label="总业绩" width="100" align="right">
                         <template slot-scope="scope">
                             {{ formatMoney(scope.row.TotalPerformance) }}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbUpdateFileInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbUpdateFileInput.cs
index 61f0fce..fed1705 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbUpdateFileInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbUpdateFileInput.cs
@@ -5,7 +5,7 @@ using NCC.Common.Model;
 namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
 {
     /// <summary>
-    /// 修改开单文件输入
+    /// 修改开单信息输入（文件、备注、简介）
     /// </summary>
     public class LqKdKdjlbUpdateFileInput
     {
@@ -24,6 +24,16 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 方案其他
         /// </summary>
         public string F_FIleUrl { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Bz { get; set; }
+
+        /// <summary>
+        /// 简介
+        /// </summary>
+        public string Jj { get; set; }
     }
 }
 
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
index b5b570c..a1fb44e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
@@ -40,6 +40,11 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string gsmd { get; set; }
 
         /// <summary>
+        /// 归属门店名称
+        /// </summary>
+        public string gsmdName { get; set; }
+
+        /// <summary>
         /// 注册时间
         /// </summary>
         public DateTime? zcsj { get; set; }
@@ -230,5 +235,9 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// </summary>
         public DateTime? consumeLevelUpdateTime { get; set; }
 
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int isEffective { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
index 5b32796..796345d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
@@ -256,5 +256,10 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 消费等级更新时间
         /// </summary>
         public DateTime? consumeLevelUpdateTime { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int isEffective { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/GoddessCardMemberListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/GoddessCardMemberListQueryInput.cs
index cc62942..53921e9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/GoddessCardMemberListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/GoddessCardMemberListQueryInput.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace NCC.Extend.Entitys.Dto.LqStatistics
 {
     /// <summary>
@@ -14,6 +16,16 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
         /// 每页数量
         /// </summary>
         public int PageSize { get; set; } = 20;
+
+        /// <summary>
+        /// 门店ID（单个门店筛选）
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店ID列表（支持多门店筛选）
+        /// </summary>
+        public List<string> StoreIds { get; set; }
     }
 }
 
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LeadCustomerStatisticsListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LeadCustomerStatisticsListOutput.cs
index b3fc690..6acf1c5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LeadCustomerStatisticsListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/LeadCustomerStatisticsListOutput.cs
@@ -23,6 +23,31 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
         public DateTime? ExpansionTime { get; set; }
 
         /// <summary>
+        /// 归属门店ID
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 归属门店名称
+        /// </summary>
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string Phone { get; set; }
+
+        /// <summary>
+        /// 拓客人员ID
+        /// </summary>
+        public string ExpansionUserId { get; set; }
+
+        /// <summary>
+        /// 拓客人员姓名
+        /// </summary>
+        public string ExpansionUserName { get; set; }
+
+        /// <summary>
         /// 是否邀约（是/否）
         /// </summary>
         public string HasInvite { get; set; }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
index 4f07244..f05c8a7 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
@@ -4080,13 +4080,13 @@ namespace NCC.Extend.LqKdKdjlb
 
                 // 构建返回结果
                 var result = PageResult<LqKdDeductinfoListOutput>.SqlSugarPageResult(data);
-                
+
                 // 单独查询统计数据，避免复杂JOIN导致的问题
                 try
                 {
                     // 先获取符合条件的开单记录ID列表（用于门店、时间、关键词筛选）
                     var billingIds = new List<string>();
-                    if (!string.IsNullOrEmpty(input.StoreId) || (input.StoreIds != null && input.StoreIds.Any()) || 
+                    if (!string.IsNullOrEmpty(input.StoreId) || (input.StoreIds != null && input.StoreIds.Any()) ||
                         input.StartTime.HasValue || input.EndTime.HasValue || !string.IsNullOrEmpty(input.keyword))
                     {
                         var billingQuery = _db.Queryable<LqKdKdjlbEntity>()
@@ -4103,7 +4103,7 @@ namespace NCC.Extend.LqKdKdjlb
                                     .Any());
                         billingIds = await billingQuery.Select(billing => billing.Id).ToListAsync();
                     }
-                    
+
                     // 构建统计查询（只查询储扣表）
                     var statisticsQuery = _db.Queryable<LqKdDeductinfoEntity>()
                         .WhereIF(input.IsEffective.HasValue, deduct => deduct.IsEffective == input.IsEffective.Value)
@@ -4121,17 +4121,17 @@ namespace NCC.Extend.LqKdKdjlb
                         .WhereIF(input.EndCreateTime.HasValue, deduct => deduct.CreateTime <= input.EndCreateTime.Value)
                         .WhereIF(!string.IsNullOrEmpty(input.ItemCategory), deduct => deduct.ItemCategory == input.ItemCategory)
                         // 关键词筛选：检查品项名称
-                        .WhereIF(!string.IsNullOrEmpty(input.keyword) && !billingIds.Any(), deduct => 
+                        .WhereIF(!string.IsNullOrEmpty(input.keyword) && !billingIds.Any(), deduct =>
                             deduct.ItemName != null && deduct.ItemName.Contains(input.keyword))
                         // 时间筛选：如果储扣记录有开单时间，也需要检查
-                        .WhereIF(input.StartTime.HasValue && !billingIds.Any(), deduct => 
+                        .WhereIF(input.StartTime.HasValue && !billingIds.Any(), deduct =>
                             deduct.BillingTime.HasValue && deduct.BillingTime >= input.StartTime.Value)
-                        .WhereIF(input.EndTime.HasValue && !billingIds.Any(), deduct => 
+                        .WhereIF(input.EndTime.HasValue && !billingIds.Any(), deduct =>
                             deduct.BillingTime.HasValue && deduct.BillingTime <= input.EndTime.Value);
 
                     // 统计总记录数
                     var totalCount = await statisticsQuery.CountAsync();
-                    
+
                     // 统计总金额和总项目数
                     var statisticsList = await statisticsQuery
                         .Select(deduct => new
@@ -4140,10 +4140,10 @@ namespace NCC.Extend.LqKdKdjlb
                             ProjectNumber = deduct.ProjectNumber ?? 0m
                         })
                         .ToListAsync();
-                    
+
                     var totalAmount = statisticsList?.Sum(x => x.Amount) ?? 0m;
                     var totalProjectNumber = statisticsList?.Sum(x => x.ProjectNumber) ?? 0m;
-                    
+
                     // 拼接统计信息到返回结果
                     return new
                     {
@@ -4449,12 +4449,14 @@ namespace NCC.Extend.LqKdKdjlb
                 throw NCCException.Oh($"清空欠款失败: {ex.Message}");
             }
         }
+        #endregion
 
+        #region 修改开单信息（文件、备注、简介）
         /// <summary>
-        /// 修改开单文件
+        /// 修改开单信息（文件、备注、简介）
         /// </summary>
         /// <remarks>
-        /// 根据开单记录ID修改上传文件（scwj）和方案其他（F_FIleUrl）字段
+        /// 根据开单记录ID修改上传文件（scwj）、方案其他（F_FIleUrl）、备注（Bz）和简介（Jj）字段
         /// 
         /// 示例请求：
         /// ```json
@@ -4466,7 +4468,9 @@ namespace NCC.Extend.LqKdKdjlb
         ///       "url": "文件URL"
         ///     }
         ///   ],
-        ///   "F_FIleUrl": "方案其他文件URL"
+        ///   "F_FIleUrl": "方案其他文件URL",
+        ///   "Bz": "备注信息",
+        ///   "Jj": "简介信息"
         /// }
         /// ```
         /// 
@@ -4474,14 +4478,16 @@ namespace NCC.Extend.LqKdKdjlb
         /// - id: 开单记录ID（必填）
         /// - scwj: 上传文件列表（可选，不传则不更新）
         /// - F_FIleUrl: 方案其他文件URL（可选，不传则不更新）
+        /// - Bz: 备注（可选，不传则不更新）
+        /// - Jj: 简介（可选，不传则不更新）
         /// </remarks>
-        /// <param name="input">更新文件输入参数</param>
+        /// <param name="input">更新信息输入参数</param>
         /// <returns>更新结果</returns>
         /// <response code="200">更新成功</response>
         /// <response code="400">参数错误或开单记录不存在</response>
         /// <response code="500">服务器错误</response>
-        [HttpPut("UpdateFile")]
-        public async Task<dynamic> UpdateFile([FromBody] LqKdKdjlbUpdateFileInput input)
+        [HttpPut("UpdateBillingInfo")]
+        public async Task<dynamic> UpdateBillingInfo([FromBody] LqKdKdjlbUpdateFileInput input)
         {
             try
             {
@@ -4531,10 +4537,30 @@ namespace NCC.Extend.LqKdKdjlb
                     updatedFields.Add("F_FIleUrl");
                 }
 
+                // 如果提供了Bz，则更新备注
+                if (input.Bz != null)
+                {
+                    updateBuilder = updateBuilder.SetColumns(it => new LqKdKdjlbEntity
+                    {
+                        Bz = input.Bz
+                    });
+                    updatedFields.Add("Bz");
+                }
+
+                // 如果提供了Jj，则更新简介
+                if (input.Jj != null)
+                {
+                    updateBuilder = updateBuilder.SetColumns(it => new LqKdKdjlbEntity
+                    {
+                        Jj = input.Jj
+                    });
+                    updatedFields.Add("Jj");
+                }
+
                 // 如果没有提供任何字段，则返回错误
                 if (!updatedFields.Any())
                 {
-                    throw NCCException.Oh("至少需要提供一个要更新的字段（scwj或F_FIleUrl）");
+                    throw NCCException.Oh("至少需要提供一个要更新的字段（scwj、F_FIleUrl、Bz或Jj）");
                 }
 
                 // 执行更新
@@ -4544,7 +4570,7 @@ namespace NCC.Extend.LqKdKdjlb
 
                 if (updateResult <= 0)
                 {
-                    throw NCCException.Oh("更新开单文件失败");
+                    throw NCCException.Oh("更新开单信息失败");
                 }
 
                 return new
@@ -4560,8 +4586,8 @@ namespace NCC.Extend.LqKdKdjlb
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, $"修改开单文件失败 - 开单ID: {input?.Id}");
-                throw NCCException.Oh($"修改开单文件失败: {ex.Message}");
+                _logger.LogError(ex, $"修改开单信息失败 - 开单ID: {input?.Id}");
+                throw NCCException.Oh($"修改开单信息失败: {ex.Message}");
             }
         }
         #endregion
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
index 3491f72..9fba079 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
@@ -75,6 +75,14 @@ namespace NCC.Extend.LqKhxx
         {
             var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
             var output = entity.Adapt<LqKhxxInfoOutput>();
+
+            // 获取归属门店名称
+            if (!string.IsNullOrEmpty(entity.Gsmd))
+            {
+                var store = await _db.Queryable<LqMdxxEntity>().Where(s => s.Id == entity.Gsmd).FirstAsync();
+                output.gsmdName = store?.Dm ?? "";
+            }
+
             if (!string.IsNullOrEmpty(entity.ExpandUser))
             {
                 var expandUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.ExpandUser).FirstAsync();
@@ -180,7 +188,8 @@ namespace NCC.Extend.LqKhxx
                     totalBillingAmount = it.TotalBillingAmount,
                     remainingRightsAmount = it.RemainingRightsAmount,
                     consumeLevel = it.ConsumeLevel,
-                    consumeLevelUpdateTime = it.ConsumeLevelUpdateTime
+                    consumeLevelUpdateTime = it.ConsumeLevelUpdateTime,
+                    isEffective = it.IsEffective
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
@@ -269,6 +278,7 @@ namespace NCC.Extend.LqKhxx
                     dah = it.Dah,
                     xb = it.Xb,
                     gsmd = it.Gsmd,
+                    gsmdName = SqlFunc.Subqueryable<LqMdxxEntity>().Where(u => u.Id == it.Gsmd).Select(u => u.Dm),
                     zcsj = it.Zcsj,
                     khlx = it.Khlx,
                     khjd = it.Khjd,
@@ -281,6 +291,33 @@ namespace NCC.Extend.LqKhxx
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
                     createTime = it.CreateTime,
+                    expandUser = it.ExpandUser,
+                    mainHealthUser = it.MainHealthUser,
+                    subHealthUser = it.SubHealthUser,
+                    expandUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.ExpandUser).Select(u => u.RealName),
+                    mainHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.MainHealthUser).Select(u => u.RealName),
+                    subHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.SubHealthUser).Select(u => u.RealName),
+                    tjrName = SqlFunc.Subqueryable<LqKhxxEntity>().Where(u => u.Id == it.Tjr).Select(u => u.Khmc),
+                    lastConsumeTime = it.LastConsumeTime,
+                    isBeautyMember = it.IsBeautyMember,
+                    isMedicalMember = it.IsMedicalMember,
+                    isTechMember = it.IsTechMember,
+                    isEducationMember = it.IsEducationMember,
+                    beautyMemberTime = it.BeautyMemberTime,
+                    medicalMemberTime = it.MedicalMemberTime,
+                    techMemberTime = it.TechMemberTime,
+                    educationMemberTime = it.EducationMemberTime,
+                    firstVisitTime = it.FirstVisitTime,
+                    lastVisitTime = it.LastVisitTime,
+                    visitDays = it.VisitDays,
+                    sleepStartTime = it.SleepStartTime,
+                    sleepDays = it.SleepDays,
+                    totalConsumeAmount = it.TotalConsumeAmount,
+                    totalBillingAmount = it.TotalBillingAmount,
+                    remainingRightsAmount = it.RemainingRightsAmount,
+                    consumeLevel = it.ConsumeLevel,
+                    consumeLevelUpdateTime = it.ConsumeLevelUpdateTime,
+                    isEffective = it.IsEffective
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
@@ -339,6 +376,7 @@ namespace NCC.Extend.LqKhxx
                     dah = it.Dah,
                     xb = it.Xb,
                     gsmd = it.Gsmd,
+                    gsmdName = SqlFunc.Subqueryable<LqMdxxEntity>().Where(u => u.Id == it.Gsmd).Select(u => u.Dm),
                     zcsj = it.Zcsj,
                     khlx = it.Khlx,
                     khjd = it.Khjd,
@@ -354,6 +392,30 @@ namespace NCC.Extend.LqKhxx
                     expandUser = it.ExpandUser,
                     mainHealthUser = it.MainHealthUser,
                     subHealthUser = it.SubHealthUser,
+                    expandUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.ExpandUser).Select(u => u.RealName),
+                    mainHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.MainHealthUser).Select(u => u.RealName),
+                    subHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.SubHealthUser).Select(u => u.RealName),
+                    tjrName = SqlFunc.Subqueryable<LqKhxxEntity>().Where(u => u.Id == it.Tjr).Select(u => u.Khmc),
+                    lastConsumeTime = it.LastConsumeTime,
+                    isBeautyMember = it.IsBeautyMember,
+                    isMedicalMember = it.IsMedicalMember,
+                    isTechMember = it.IsTechMember,
+                    isEducationMember = it.IsEducationMember,
+                    beautyMemberTime = it.BeautyMemberTime,
+                    medicalMemberTime = it.MedicalMemberTime,
+                    techMemberTime = it.TechMemberTime,
+                    educationMemberTime = it.EducationMemberTime,
+                    firstVisitTime = it.FirstVisitTime,
+                    lastVisitTime = it.LastVisitTime,
+                    visitDays = it.VisitDays,
+                    sleepStartTime = it.SleepStartTime,
+                    sleepDays = it.SleepDays,
+                    totalConsumeAmount = it.TotalConsumeAmount,
+                    totalBillingAmount = it.TotalBillingAmount,
+                    remainingRightsAmount = it.RemainingRightsAmount,
+                    consumeLevel = it.ConsumeLevel,
+                    consumeLevelUpdateTime = it.ConsumeLevelUpdateTime,
+                    isEffective = it.IsEffective
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
index 61fc067..4fc9207 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
@@ -3180,8 +3180,27 @@ namespace NCC.Extend.LqStatistics
         #region 其他统计模块列表查询接口
 
         /// <summary>
-        /// 获取金三角开卡业绩统计列表
+        /// 获取金三角开卡业绩统计列表（实时统计）
         /// </summary>
+        /// <remarks>
+        /// 实时从业务表统计金三角的开卡业绩数据，包括订单数量、总业绩、首次和最后订单日期
+        /// 
+        /// 数据来源：
+        /// - lq_ycsd_jsj: 金三角基础信息表
+        /// - lq_kd_jksyj: 健康师业绩表（开单业绩）
+        /// - lq_mdxx: 门店信息表
+        /// 
+        /// 统计逻辑：
+        /// - 按金三角ID、月份、门店分组统计
+        /// - 订单数量：去重统计开单编号（glkdbh）
+        /// - 总业绩：汇总健康师业绩（jksyj），过滤空值和0值
+        /// - 首次/最后订单日期：取业绩时间（yjsj）的最小值和最大值
+        /// 
+        /// 性能优化：
+        /// - 使用索引：jsj_id, yjsj, F_IsEffective
+        /// - 先过滤再JOIN，减少数据量
+        /// - 使用子查询优化聚合计算
+        /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>分页结果</returns>
         [HttpPost("get-gold-triangle-statistics-list")]
@@ -3189,40 +3208,100 @@ namespace NCC.Extend.LqStatistics
         {
             try
             {
-                var query = _db.Queryable<LqStatisticsGoldTriangleEntity>();
+                // 构建WHERE条件
+                var whereConditions = new List<string>();
+                var parameters = new List<SugarParameter>();
 
-                // 添加查询条件
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StatisticsMonth), x => x.StatisticsMonth == input.StatisticsMonth);
-                query = query.WhereIF(!string.IsNullOrEmpty(input.GoldTriangleName), x => x.GoldTriangleName.Contains(input.GoldTriangleName));
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StoreName), x => x.StoreName.Contains(input.StoreName));
+                // 月份条件
+                if (!string.IsNullOrEmpty(input.StatisticsMonth))
+                {
+                    whereConditions.Add("jsj.yf = @StatisticsMonth");
+                    parameters.Add(new SugarParameter("@StatisticsMonth", input.StatisticsMonth));
+                }
 
-                // 按创建时间降序排序
-                query = query.OrderBy(x => x.CreateTime, OrderByType.Desc);
+                // 金三角名称条件
+                if (!string.IsNullOrEmpty(input.GoldTriangleName))
+                {
+                    whereConditions.Add("jsj.jsj LIKE @GoldTriangleName");
+                    parameters.Add(new SugarParameter("@GoldTriangleName", $"%{input.GoldTriangleName}%"));
+                }
 
-                // 分页查询并映射到DTO
-                var result = await query.Select(it => new LqGoldTriangleStatisticsListOutput
+                // 门店名称条件
+                if (!string.IsNullOrEmpty(input.StoreName))
                 {
-                    Id = it.Id,
-                    GoldTriangleId = it.GoldTriangleId,
-                    GoldTriangleName = it.GoldTriangleName,
-                    StatisticsMonth = it.StatisticsMonth,
-                    StoreId = it.StoreId,
-                    StoreName = it.StoreName,
-                    OrderCount = it.OrderCount,
-                    TotalPerformance = it.TotalPerformance,
-                    FirstOrderDate = it.FirstOrderDate,
-                    LastOrderDate = it.LastOrderDate,
-                    CreateTime = it.CreateTime
-                }).ToPagedListAsync(input.PageIndex, input.PageSize);
+                    whereConditions.Add("md.dm LIKE @StoreName");
+                    parameters.Add(new SugarParameter("@StoreName", $"%{input.StoreName}%"));
+                }
+
+                var whereClause = whereConditions.Any() ? "WHERE " + string.Join(" AND ", whereConditions) : "";
+
+                // 实时统计SQL - 优化性能
+                // 使用子查询先过滤有效业绩数据，减少JOIN数据量
+                var sql = $@"
+                    SELECT 
+                        CONCAT(jsj.F_Id, '_', jsj.yf) AS Id,
+                        jsj.F_Id AS GoldTriangleId,
+                        jsj.jsj AS GoldTriangleName,
+                        jsj.yf AS StatisticsMonth,
+                        jsj.md AS StoreId,
+                        COALESCE(md.dm, '') AS StoreName,
+                        COALESCE(stats.OrderCount, 0) AS OrderCount,
+                        COALESCE(stats.TotalPerformance, 0) AS TotalPerformance,
+                        stats.FirstOrderDate,
+                        stats.LastOrderDate,
+                        NOW() AS CreateTime
+                    FROM lq_ycsd_jsj jsj
+                    LEFT JOIN lq_mdxx md ON jsj.md = md.F_Id
+                    LEFT JOIN (
+                        -- 子查询：按金三角ID和月份统计业绩数据（先过滤再聚合，提高效率）
+                        SELECT 
+                            jksyj.jsj_id,
+                            YEAR(jksyj.yjsj) * 100 + MONTH(jksyj.yjsj) AS statistics_month,
+                            COUNT(DISTINCT jksyj.glkdbh) AS OrderCount,
+                            SUM(CAST(jksyj.jksyj AS DECIMAL(18,2))) AS TotalPerformance,
+                            MIN(jksyj.yjsj) AS FirstOrderDate,
+                            MAX(jksyj.yjsj) AS LastOrderDate
+                        FROM lq_kd_jksyj jksyj
+                        WHERE jksyj.F_IsEffective = 1
+                            AND jksyj.yjsj IS NOT NULL
+                            AND jksyj.jksyj IS NOT NULL
+                            AND jksyj.jksyj != ''
+                            AND jksyj.jksyj != '0'
+                            AND jksyj.jsj_id IS NOT NULL
+                            AND jksyj.jsj_id != ''
+                        GROUP BY jksyj.jsj_id, YEAR(jksyj.yjsj), MONTH(jksyj.yjsj)
+                    ) stats ON (
+                        stats.jsj_id = jsj.F_Id
+                        AND stats.statistics_month = CAST(jsj.yf AS UNSIGNED)
+                    )
+                    {whereClause}
+                    ORDER BY stats.TotalPerformance DESC, jsj.yf DESC
+                    LIMIT @PageSize OFFSET @Offset";
+
+                parameters.Add(new SugarParameter("@PageSize", input.PageSize));
+                parameters.Add(new SugarParameter("@Offset", (input.PageIndex - 1) * input.PageSize));
+
+                // 查询总数
+                var countSql = $@"
+                    SELECT COUNT(DISTINCT jsj.F_Id)
+                    FROM lq_ycsd_jsj jsj
+                    LEFT JOIN lq_mdxx md ON jsj.md = md.F_Id
+                    {whereClause}";
+
+                var countParameters = parameters.Where(p => p.ParameterName != "@PageSize" && p.ParameterName != "@Offset").ToList();
+                var totalCount = await _db.Ado.GetIntAsync(countSql, countParameters);
+
+                // 执行查询
+                var result = await _db.Ado.SqlQueryAsync<LqGoldTriangleStatisticsListOutput>(sql, parameters);
 
                 return new
                 {
-                    list = result.list,
+                    list = result,
                     pagination = new
                     {
                         pageIndex = input.PageIndex,
                         pageSize = input.PageSize,
-                        total = result.pagination.Total
+                        total = totalCount
                     }
                 };
             }
@@ -3234,8 +3313,26 @@ namespace NCC.Extend.LqStatistics
         }
 
         /// <summary>
-        /// 获取科技部开单业绩统计列表
+        /// 获取科技部开单业绩统计列表（实时统计）
         /// </summary>
+        /// <remarks>
+        /// 实时从业务表统计科技部老师的开单业绩数据，包括订单数量、总业绩等
+        /// 
+        /// 数据来源：
+        /// - lq_kd_kjbsyj: 科技部老师开单业绩表
+        /// - lq_kd_pxmx: 开单品项明细表（用于统计项目数量）
+        /// 
+        /// 统计逻辑：
+        /// - 按老师ID分组统计
+        /// - 订单数量：去重统计开单品项ID（F_kdpxid）
+        /// - 总业绩：汇总科技部老师业绩（kjblsyj），过滤空值和0值
+        /// - 项目数量：汇总品项明细的项目数量（F_ProjectNumber）
+        /// 
+        /// 性能优化：
+        /// - 使用索引：kjbls, yjsj, F_IsEffective
+        /// - 先过滤再聚合，减少数据量
+        /// - 使用子查询优化聚合计算
+        /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>分页结果</returns>
         [HttpPost("get-tech-performance-statistics-list")]
@@ -3243,38 +3340,84 @@ namespace NCC.Extend.LqStatistics
         {
             try
             {
-                var query = _db.Queryable<LqStatisticsTechPerformanceEntity>();
+                // 构建WHERE条件
+                var whereConditions = new List<string>();
+                var parameters = new List<SugarParameter>();
 
-                // 添加查询条件
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StatisticsMonth), x => x.StatisticsMonth == input.StatisticsMonth);
-                query = query.WhereIF(!string.IsNullOrEmpty(input.TeacherName), x => x.TeacherName.Contains(input.TeacherName));
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StoreName), x => x.StoreName.Contains(input.StoreName));
+                // 基础条件
+                var baseConditions = new List<string>
+                {
+                    "k.kjbls IS NOT NULL",
+                    "k.kjblsxm IS NOT NULL",
+                    "k.yjsj IS NOT NULL",
+                    "k.kjblsyj IS NOT NULL",
+                    "k.kjblsyj != ''",
+                    "k.kjblsyj != '0'",
+                    "k.F_IsEffective = 1"
+                };
 
-                // 按创建时间降序排序
-                query = query.OrderBy(x => x.CreateTime, OrderByType.Desc);
+                // 月份条件
+                if (!string.IsNullOrEmpty(input.StatisticsMonth))
+                {
+                    var year = int.Parse(input.StatisticsMonth.Substring(0, 4));
+                    var month = int.Parse(input.StatisticsMonth.Substring(4, 2));
+                    baseConditions.Add("YEAR(k.yjsj) = @Year");
+                    baseConditions.Add("MONTH(k.yjsj) = @Month");
+                    parameters.Add(new SugarParameter("@Year", year));
+                    parameters.Add(new SugarParameter("@Month", month));
+                }
 
-                // 分页查询并映射到DTO
-                var result = await query.Select(it => new LqTechPerformanceStatisticsListOutput
+                // 老师姓名条件
+                if (!string.IsNullOrEmpty(input.TeacherName))
                 {
-                    Id = it.Id,
-                    StatisticsMonth = it.StatisticsMonth,
-                    TeacherId = it.TeacherId,
-                    TeacherName = it.TeacherName,
-                    StoreId = it.StoreId,
-                    StoreName = it.StoreName,
-                    TotalPerformance = it.TotalPerformance,
-                    OrderCount = it.OrderCount,
-                    CreateTime = it.CreateTime
-                }).ToPagedListAsync(input.PageIndex, input.PageSize);
+                    baseConditions.Add("k.kjblsxm LIKE @TeacherName");
+                    parameters.Add(new SugarParameter("@TeacherName", $"%{input.TeacherName}%"));
+                }
+
+                var whereClause = "WHERE " + string.Join(" AND ", baseConditions);
+
+                // 实时统计SQL - 优化性能
+                var sql = $@"
+                    SELECT 
+                        CONCAT(k.kjbls, '_', DATE_FORMAT(k.yjsj, '%Y%m')) AS Id,
+                        DATE_FORMAT(k.yjsj, '%Y%m') AS StatisticsMonth,
+                        k.kjbls AS TeacherId,
+                        k.kjblsxm AS TeacherName,
+                        '' AS StoreId,
+                        '' AS StoreName,
+                        COUNT(DISTINCT k.F_kdpxid) AS OrderCount,
+                        SUM(CAST(COALESCE(k.kjblsyj, 0) AS DECIMAL(18,2))) AS TotalPerformance,
+                        NOW() AS CreateTime
+                    FROM lq_kd_kjbsyj k
+                    LEFT JOIN lq_kd_pxmx pm ON k.F_kdpxid = pm.F_Id AND pm.F_IsEffective = 1
+                    {whereClause}
+                    GROUP BY k.kjbls, k.kjblsxm, DATE_FORMAT(k.yjsj, '%Y%m')
+                    ORDER BY TotalPerformance DESC, StatisticsMonth DESC
+                    LIMIT @PageSize OFFSET @Offset";
+
+                parameters.Add(new SugarParameter("@PageSize", input.PageSize));
+                parameters.Add(new SugarParameter("@Offset", (input.PageIndex - 1) * input.PageSize));
+
+                // 查询总数
+                var countSql = $@"
+                    SELECT COUNT(DISTINCT CONCAT(k.kjbls, '_', DATE_FORMAT(k.yjsj, '%Y%m')))
+                    FROM lq_kd_kjbsyj k
+                    {whereClause}";
+
+                var countParameters = parameters.Where(p => p.ParameterName != "@PageSize" && p.ParameterName != "@Offset").ToList();
+                var totalCount = await _db.Ado.GetIntAsync(countSql, countParameters);
+
+                // 执行查询
+                var result = await _db.Ado.SqlQueryAsync<LqTechPerformanceStatisticsListOutput>(sql, parameters);
 
                 return new
                 {
-                    list = result.list,
+                    list = result,
                     pagination = new
                     {
                         pageIndex = input.PageIndex,
                         pageSize = input.PageSize,
-                        total = result.pagination.Total
+                        total = totalCount
                     }
                 };
             }
@@ -3286,8 +3429,27 @@ namespace NCC.Extend.LqStatistics
         }
 
         /// <summary>
-        /// 获取门店耗卡业绩统计列表
+        /// 获取门店耗卡业绩统计列表（实时统计）
         /// </summary>
+        /// <remarks>
+        /// 实时从业务表统计门店的耗卡业绩数据，包括耗卡业绩、项目数量、手工费等
+        /// 
+        /// 数据来源：
+        /// - lq_xh_hyhk: 耗卡表
+        /// - lq_xh_pxmx: 耗卡品项明细表
+        /// - lq_mdxx: 门店信息表
+        /// 
+        /// 统计逻辑：
+        /// - 按门店分组统计
+        /// - 耗卡业绩：汇总品项明细的总价（F_TotalPrice）
+        /// - 项目数量：汇总品项明细的项目数量（F_ProjectNumber）
+        /// - 手工费：汇总耗卡表的手工费（sgfy）
+        /// 
+        /// 性能优化：
+        /// - 使用索引：md, hksj, F_IsEffective
+        /// - 先过滤再聚合，减少数据量
+        /// - 使用子查询优化聚合计算
+        /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>分页结果</returns>
         [HttpPost("get-store-consume-performance-statistics-list")]
@@ -3295,39 +3457,92 @@ namespace NCC.Extend.LqStatistics
         {
             try
             {
-                var query = _db.Queryable<LqStatisticsStoreConsumePerformanceEntity>();
+                // 构建WHERE条件
+                var whereConditions = new List<string>();
+                var parameters = new List<SugarParameter>();
 
-                // 添加查询条件
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StatisticsMonth), x => x.StatisticsMonth == input.StatisticsMonth);
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StoreName), x => x.StoreName.Contains(input.StoreName));
+                // 月份条件
+                if (!string.IsNullOrEmpty(input.StatisticsMonth))
+                {
+                    whereConditions.Add("DATE_FORMAT(hyhk.hksj, '%Y%m') = @StatisticsMonth");
+                    parameters.Add(new SugarParameter("@StatisticsMonth", input.StatisticsMonth));
+                }
 
-                // 按创建时间降序排序
-                query = query.OrderBy(x => x.CreateTime, OrderByType.Desc);
+                // 门店名称条件
+                if (!string.IsNullOrEmpty(input.StoreName))
+                {
+                    whereConditions.Add("(hyhk.mdmc LIKE @StoreName OR mdxx.dm LIKE @StoreName)");
+                    parameters.Add(new SugarParameter("@StoreName", $"%{input.StoreName}%"));
+                }
 
-                // 分页查询并映射到DTO
-                var pagedResult = await query.ToPagedListAsync(input.PageIndex, input.PageSize);
+                // 基础条件
+                whereConditions.Add("hyhk.F_IsEffective = 1");
 
-                var outputList = pagedResult.list.Select(it => new LqStoreConsumePerformanceStatisticsListOutput
-                {
-                    Id = it.Id,
-                    StatisticsMonth = it.StatisticsMonth,
-                    StoreId = it.StoreId,
-                    StoreName = it.StoreName,
-                    TotalPerformance = it.ConsumePerformance, // 使用ConsumePerformance作为总业绩
-                    ConsumePerformance = it.ConsumePerformance,
-                    OrderCount = (int)it.ConsumeQuantity, // 使用ConsumeQuantity作为订单数量
-                    IsNewStore = false, // 暂时设为false，因为Entity中没有这个字段
-                    CreateTime = it.CreateTime.HasValue ? it.CreateTime.Value : DateTime.Now
-                }).ToList();
+                var whereClause = "WHERE " + string.Join(" AND ", whereConditions);
+
+                // 实时统计SQL - 优化性能
+                var sql = $@"
+                    SELECT 
+                        CONCAT(hyhk.md, '_', DATE_FORMAT(hyhk.hksj, '%Y%m')) AS Id,
+                        DATE_FORMAT(hyhk.hksj, '%Y%m') AS StatisticsMonth,
+                        hyhk.md AS StoreId,
+                        COALESCE(hyhk.mdmc, mdxx.dm, '') AS StoreName,
+                        COALESCE(SUM(pxmx.F_TotalPrice), 0) AS ConsumePerformance,
+                        COALESCE(SUM(pxmx.F_TotalPrice), 0) AS TotalPerformance,
+                        CAST(COALESCE(SUM(pxmx.F_ProjectNumber), 0) AS UNSIGNED) AS OrderCount,
+                        CASE 
+                            WHEN EXISTS (
+                                SELECT 1 FROM lq_md_xdbhsj xdbh
+                                WHERE xdbh.mdid = hyhk.md
+                                    AND xdbh.sfqy = 1
+                                    AND xdbh.bhkssj <= DATE_FORMAT(hyhk.hksj, '%Y-%m-%d')
+                                    AND xdbh.bhjssj >= DATE_FORMAT(hyhk.hksj, '%Y-%m-%d')
+                                LIMIT 1
+                            ) THEN 1
+                            ELSE 0
+                        END AS IsNewStore,
+                        NOW() AS CreateTime
+                    FROM lq_xh_hyhk hyhk
+                    LEFT JOIN lq_xh_pxmx pxmx ON hyhk.F_Id = pxmx.F_ConsumeInfoId AND pxmx.F_IsEffective = 1
+                    LEFT JOIN lq_mdxx mdxx ON hyhk.md = mdxx.F_Id
+                    {whereClause}
+                    GROUP BY hyhk.md, hyhk.mdmc, mdxx.dm, DATE_FORMAT(hyhk.hksj, '%Y%m')
+                    HAVING ConsumePerformance > 0 OR OrderCount > 0
+                    ORDER BY ConsumePerformance DESC, StatisticsMonth DESC
+                    LIMIT @PageSize OFFSET @Offset";
+
+                parameters.Add(new SugarParameter("@PageSize", input.PageSize));
+                parameters.Add(new SugarParameter("@Offset", (input.PageIndex - 1) * input.PageSize));
+
+                // 查询总数（使用子查询统计满足条件的分组数）
+                var countSql = $@"
+                    SELECT COUNT(*)
+                    FROM (
+                        SELECT 
+                            hyhk.md,
+                            DATE_FORMAT(hyhk.hksj, '%Y%m') AS month_key
+                        FROM lq_xh_hyhk hyhk
+                        LEFT JOIN lq_xh_pxmx pxmx ON hyhk.F_Id = pxmx.F_ConsumeInfoId AND pxmx.F_IsEffective = 1
+                        LEFT JOIN lq_mdxx mdxx ON hyhk.md = mdxx.F_Id
+                        {whereClause}
+                        GROUP BY hyhk.md, DATE_FORMAT(hyhk.hksj, '%Y%m')
+                        HAVING COALESCE(SUM(pxmx.F_TotalPrice), 0) > 0 OR COALESCE(SUM(pxmx.F_ProjectNumber), 0) > 0
+                    ) AS grouped_data";
+
+                var countParameters = parameters.Where(p => p.ParameterName != "@PageSize" && p.ParameterName != "@Offset").ToList();
+                var totalCount = await _db.Ado.GetIntAsync(countSql, countParameters);
+
+                // 执行查询
+                var result = await _db.Ado.SqlQueryAsync<LqStoreConsumePerformanceStatisticsListOutput>(sql, parameters);
 
                 return new
                 {
-                    list = outputList,
+                    list = result,
                     pagination = new
                     {
                         pageIndex = input.PageIndex,
                         pageSize = input.PageSize,
-                        total = pagedResult.pagination.Total
+                        total = totalCount
                     }
                 };
             }
@@ -3339,8 +3554,28 @@ namespace NCC.Extend.LqStatistics
         }
 
         /// <summary>
-        /// 获取个人消耗业绩统计列表
+        /// 获取部门消耗业绩统计列表（实时统计）
         /// </summary>
+        /// <remarks>
+        /// 实时从业务表统计部门员工的消耗业绩数据，包括健康师和科技部老师两种类型
+        /// 
+        /// 数据来源：
+        /// - lq_xh_jksyj: 健康师消耗业绩表
+        /// - lq_xh_kjbsyj: 科技部老师消耗业绩表
+        /// - lq_xh_hyhk: 耗卡表（用于获取时间和门店信息）
+        /// - lq_mdxx: 门店信息表
+        /// 
+        /// 统计逻辑：
+        /// - 健康师：按健康师ID、门店分组，统计消耗业绩、项目数量、人头、人次
+        /// - 科技部老师：按老师ID、门店分组，统计消耗业绩、项目数量（人头、人次为0）
+        /// - 人头：月度去重客户数
+        /// - 人次：日度去重到店数（每天同一个客户只算一次）
+        /// 
+        /// 性能优化：
+        /// - 使用UNION ALL合并健康师和科技部老师数据
+        /// - 使用子查询优化人头和人次统计
+        /// - 使用索引：jkszh/kjblszh, md, hksj, F_IsEffective
+        /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>分页结果</returns>
         [HttpPost("get-department-consume-performance-statistics-list")]
@@ -3348,45 +3583,196 @@ namespace NCC.Extend.LqStatistics
         {
             try
             {
-                var query = _db.Queryable<LqStatisticsDepartmentConsumePerformanceEntity>();
+                // 构建WHERE条件
+                var whereConditions = new List<string>();
+                var parameters = new List<SugarParameter>();
 
-                // 添加查询条件
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StatisticsMonth), x => x.StatisticsMonth == input.StatisticsMonth);
-                query = query.WhereIF(!string.IsNullOrEmpty(input.EmployeeName), x => x.UserName.Contains(input.EmployeeName));
-                query = query.WhereIF(!string.IsNullOrEmpty(input.StoreName), x => x.StoreName.Contains(input.StoreName));
-                query = query.WhereIF(!string.IsNullOrEmpty(input.Position), x => x.DepartmentType.Contains(input.Position));
+                // 月份条件（用于子查询）
+                var monthCondition = "";
+                if (!string.IsNullOrEmpty(input.StatisticsMonth))
+                {
+                    monthCondition = "AND DATE_FORMAT(hyhk_inner.hksj, '%Y%m') = @StatisticsMonth";
+                    whereConditions.Add("DATE_FORMAT(hyhk.hksj, '%Y%m') = @StatisticsMonth");
+                    parameters.Add(new SugarParameter("@StatisticsMonth", input.StatisticsMonth));
+                }
 
-                // 按创建时间降序排序
-                query = query.OrderBy(x => x.CreateTime, OrderByType.Desc);
+                // 员工姓名条件（需要在UNION的两个查询中都添加）
+                var employeeNameConditionJks = "";
+                var employeeNameConditionKjbs = "";
+                if (!string.IsNullOrEmpty(input.EmployeeName))
+                {
+                    employeeNameConditionJks = "AND jksyj.jksxm LIKE @EmployeeName";
+                    employeeNameConditionKjbs = "AND kjbsyj.kjblsxm LIKE @EmployeeName";
+                    parameters.Add(new SugarParameter("@EmployeeName", $"%{input.EmployeeName}%"));
+                }
 
-                // 分页查询并映射到DTO
-                var pagedResult = await query.ToPagedListAsync(input.PageIndex, input.PageSize);
+                // 门店名称条件
+                var storeNameCondition = "";
+                if (!string.IsNullOrEmpty(input.StoreName))
+                {
+                    storeNameCondition = "AND (hyhk.mdmc LIKE @StoreName OR md.dm LIKE @StoreName)";
+                    parameters.Add(new SugarParameter("@StoreName", $"%{input.StoreName}%"));
+                }
 
-                var outputList = pagedResult.list.Select(it => new LqDepartmentConsumePerformanceStatisticsListOutput
+                // 岗位条件
+                var positionCondition = "";
+                if (!string.IsNullOrEmpty(input.Position))
                 {
-                    Id = it.Id,
-                    StatisticsMonth = it.StatisticsMonth,
-                    EmployeeId = it.UserId,
-                    EmployeeName = it.UserName,
-                    StoreId = it.StoreId,
-                    StoreName = it.StoreName,
-                    Position = it.DepartmentType,
-                    TotalPerformance = it.ConsumePerformance, // 使用ConsumePerformance作为总业绩
-                    ConsumePerformance = it.ConsumePerformance,
-                    OrderCount = it.ConsumeQuantity, // 使用ConsumeQuantity作为订单数量
-                    HeadCount = it.HeadCount, // 人头数
-                    PersonCount = it.PersonCount, // 人次
-                    CreateTime = it.CreateTime.HasValue ? it.CreateTime.Value : DateTime.Now
-                }).ToList();
+                    positionCondition = "AND dept_type LIKE @Position";
+                    parameters.Add(new SugarParameter("@Position", $"%{input.Position}%"));
+                }
+
+                var baseWhere = whereConditions.Any() ? string.Join(" AND ", whereConditions) : "";
+                var baseWhereClause = !string.IsNullOrEmpty(baseWhere) ? "WHERE " + baseWhere : "";
+
+                // 实时统计SQL - 使用UNION ALL合并健康师和科技部老师数据
+                var sql = $@"
+                    SELECT 
+                        CONCAT(dept_type, '_', user_id, '_', store_id, '_', statistics_month) AS Id,
+                        statistics_month AS StatisticsMonth,
+                        user_id AS EmployeeId,
+                        user_name AS EmployeeName,
+                        store_id AS StoreId,
+                        store_name AS StoreName,
+                        dept_type AS Position,
+                        consume_performance AS ConsumePerformance,
+                        consume_performance AS TotalPerformance,
+                        consume_quantity AS OrderCount,
+                        head_count AS HeadCount,
+                        person_count AS PersonCount,
+                        0 AS RefundAmount,
+                        0 AS RefundCount,
+                        NOW() AS CreateTime
+                    FROM (
+                        -- 健康师消耗业绩统计
+                        SELECT 
+                            '健康师' AS dept_type,
+                            jksyj.jkszh AS user_id,
+                            jksyj.jksxm AS user_name,
+                            hyhk.md AS store_id,
+                            COALESCE(hyhk.mdmc, md.dm, '') AS store_name,
+                            DATE_FORMAT(hyhk.hksj, '%Y%m') AS statistics_month,
+                            COALESCE(SUM(jksyj.jksyj), 0) AS consume_performance,
+                            COALESCE(SUM(jksyj.F_kdpxNumber), 0) AS consume_quantity,
+                            COALESCE(headcount_stats.head_count, 0) AS head_count,
+                            COALESCE(personcount_stats.person_count, 0) AS person_count
+                        FROM lq_xh_jksyj jksyj
+                        INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id AND hyhk.F_IsEffective = 1
+                        LEFT JOIN lq_mdxx md ON hyhk.md = md.F_Id
+                        LEFT JOIN (
+                            -- 人头统计：月度去重客户数
+                            SELECT 
+                                jksyj_inner.jkszh,
+                                hyhk_inner.md,
+                                COUNT(DISTINCT hyhk_inner.hy) AS head_count
+                            FROM lq_xh_jksyj jksyj_inner
+                            INNER JOIN lq_xh_hyhk hyhk_inner ON jksyj_inner.glkdbh = hyhk_inner.F_Id AND hyhk_inner.F_IsEffective = 1
+                            WHERE jksyj_inner.F_IsEffective = 1
+                                {monthCondition}
+                            GROUP BY jksyj_inner.jkszh, hyhk_inner.md
+                        ) headcount_stats ON jksyj.jkszh = headcount_stats.jkszh AND hyhk.md = headcount_stats.md
+                        LEFT JOIN (
+                            -- 人次统计：日度去重客户数
+                            SELECT 
+                                jksyj_inner.jkszh,
+                                hyhk_inner.md,
+                                COUNT(DISTINCT CONCAT(hyhk_inner.hy, '-', DATE(hyhk_inner.hksj))) AS person_count
+                            FROM lq_xh_jksyj jksyj_inner
+                            INNER JOIN lq_xh_hyhk hyhk_inner ON jksyj_inner.glkdbh = hyhk_inner.F_Id AND hyhk_inner.F_IsEffective = 1
+                            WHERE jksyj_inner.F_IsEffective = 1
+                                {monthCondition}
+                            GROUP BY jksyj_inner.jkszh, hyhk_inner.md
+                        ) personcount_stats ON jksyj.jkszh = personcount_stats.jkszh AND hyhk.md = personcount_stats.md
+                        WHERE jksyj.F_IsEffective = 1
+                            {(!string.IsNullOrEmpty(baseWhere) ? "AND " + baseWhere : "")}
+                            {employeeNameConditionJks}
+                            {storeNameCondition}
+                        GROUP BY jksyj.jkszh, jksyj.jksxm, hyhk.md, hyhk.mdmc, md.dm, DATE_FORMAT(hyhk.hksj, '%Y%m'), headcount_stats.head_count, personcount_stats.person_count, statistics_month
+                        
+                        UNION ALL
+                        
+                        -- 科技部老师消耗业绩统计
+                        SELECT 
+                            '科技部老师' AS dept_type,
+                            kjbsyj.kjblszh AS user_id,
+                            kjbsyj.kjblsxm AS user_name,
+                            hyhk.md AS store_id,
+                            COALESCE(hyhk.mdmc, md.dm, '') AS store_name,
+                            DATE_FORMAT(hyhk.hksj, '%Y%m') AS statistics_month,
+                            COALESCE(SUM(kjbsyj.kjblsyj), 0) AS consume_performance,
+                            COALESCE(SUM(kjbsyj.F_hdpxNumber), 0) AS consume_quantity,
+                            0 AS head_count,
+                            0 AS person_count
+                        FROM lq_xh_kjbsyj kjbsyj
+                        INNER JOIN lq_xh_hyhk hyhk ON kjbsyj.glkdbh = hyhk.F_Id AND hyhk.F_IsEffective = 1
+                        LEFT JOIN lq_mdxx md ON hyhk.md = md.F_Id
+                        WHERE kjbsyj.F_IsEffective = 1
+                            {(!string.IsNullOrEmpty(baseWhere) ? "AND " + baseWhere : "")}
+                            {employeeNameConditionKjbs}
+                            {storeNameCondition}
+                        GROUP BY kjbsyj.kjblszh, kjbsyj.kjblsxm, hyhk.md, hyhk.mdmc, md.dm, DATE_FORMAT(hyhk.hksj, '%Y%m')
+                    ) combined_stats
+                    WHERE 1=1
+                        {positionCondition}
+                    ORDER BY consume_performance DESC, StatisticsMonth DESC
+                    LIMIT @PageSize OFFSET @Offset";
+
+                parameters.Add(new SugarParameter("@PageSize", input.PageSize));
+                parameters.Add(new SugarParameter("@Offset", (input.PageIndex - 1) * input.PageSize));
+
+                // 查询总数（需要重新构建，因为UNION ALL的结构）
+                var countSql = $@"
+                    SELECT COUNT(*)
+                    FROM (
+                        SELECT 
+                            '健康师' AS dept_type,
+                            jksyj.jkszh AS user_id,
+                            jksyj.jksxm AS user_name,
+                            hyhk.md AS store_id,
+                            COALESCE(hyhk.mdmc, md.dm, '') AS store_name
+                        FROM lq_xh_jksyj jksyj
+                        INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id AND hyhk.F_IsEffective = 1
+                        LEFT JOIN lq_mdxx md ON hyhk.md = md.F_Id
+                        WHERE jksyj.F_IsEffective = 1
+                            {(!string.IsNullOrEmpty(baseWhere) ? "AND " + baseWhere : "")}
+                            {employeeNameConditionJks}
+                            {storeNameCondition}
+                        GROUP BY jksyj.jkszh, jksyj.jksxm, hyhk.md, hyhk.mdmc, md.dm, DATE_FORMAT(hyhk.hksj, '%Y%m')
+                        
+                        UNION ALL
+                        
+                        SELECT 
+                            '科技部老师' AS dept_type,
+                            kjbsyj.kjblszh AS user_id,
+                            kjbsyj.kjblsxm AS user_name,
+                            hyhk.md AS store_id,
+                            COALESCE(hyhk.mdmc, md.dm, '') AS store_name
+                        FROM lq_xh_kjbsyj kjbsyj
+                        INNER JOIN lq_xh_hyhk hyhk ON kjbsyj.glkdbh = hyhk.F_Id AND hyhk.F_IsEffective = 1
+                        LEFT JOIN lq_mdxx md ON hyhk.md = md.F_Id
+                        WHERE kjbsyj.F_IsEffective = 1
+                            {(!string.IsNullOrEmpty(baseWhere) ? "AND " + baseWhere : "")}
+                            {employeeNameConditionKjbs}
+                            {storeNameCondition}
+                        GROUP BY kjbsyj.kjblszh, kjbsyj.kjblsxm, hyhk.md, hyhk.mdmc, md.dm, DATE_FORMAT(hyhk.hksj, '%Y%m')
+                    ) combined_stats
+                    WHERE 1=1
+                        {positionCondition}";
+
+                var countParameters = parameters.Where(p => p.ParameterName != "@PageSize" && p.ParameterName != "@Offset").ToList();
+                var totalCount = await _db.Ado.GetIntAsync(countSql, countParameters);
+
+                // 执行查询
+                var result = await _db.Ado.SqlQueryAsync<LqDepartmentConsumePerformanceStatisticsListOutput>(sql, parameters);
 
                 return new
                 {
-                    list = outputList,
+                    list = result,
                     pagination = new
                     {
                         pageIndex = input.PageIndex,
                         pageSize = input.PageSize,
-                        total = pagedResult.pagination.Total
+                        total = totalCount
                     }
                 };
             }
@@ -4074,6 +4460,22 @@ namespace NCC.Extend.LqStatistics
         /// 1. 会员必须有购买女神卡的记录
         /// 2. 该会员的所有有效开单记录中，所有品项都必须是女神卡（px = "61"）
         /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "PageIndex": 1,
+        ///   "PageSize": 20,
+        ///   "StoreId": "门店ID",
+        ///   "StoreIds": ["门店ID1", "门店ID2"]
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - PageIndex: 当前页码（从1开始）
+        /// - PageSize: 每页数量
+        /// - StoreId: 门店ID（单个门店筛选，与StoreIds二选一）
+        /// - StoreIds: 门店ID列表（支持多门店筛选，与StoreId二选一）
+        /// 
         /// 返回说明：
         /// - list: 会员列表
         ///   - memberId: 会员ID
@@ -4111,9 +4513,30 @@ namespace NCC.Extend.LqStatistics
         {
             try
             {
+                // 构建门店筛选条件
+                var storeFilterConditions = new List<string>();
+                var parameters = new List<SugarParameter>();
+
+                if (!string.IsNullOrEmpty(input.StoreId))
+                {
+                    storeFilterConditions.Add("kd1.djmd = @StoreId");
+                    parameters.Add(new SugarParameter("@StoreId", input.StoreId));
+                }
+                else if (input.StoreIds != null && input.StoreIds.Any())
+                {
+                    var storeIdParams = string.Join(",", input.StoreIds.Select((_, i) => $"@StoreId{i}"));
+                    storeFilterConditions.Add($"kd1.djmd IN ({storeIdParams})");
+                    for (int i = 0; i < input.StoreIds.Count; i++)
+                    {
+                        parameters.Add(new SugarParameter($"@StoreId{i}", input.StoreIds[i]));
+                    }
+                }
+
+                var storeFilterClause = storeFilterConditions.Any() ? "AND " + string.Join(" AND ", storeFilterConditions) : "";
+
                 // 使用SQL一次性查询出符合条件的会员ID
                 // 逻辑：会员有购买女神卡的记录，且该会员的所有开单记录的所有品项都是女神卡
-                var sql = @"
+                var sql = $@"
                     SELECT DISTINCT kd1.Kdhy AS MemberId
                     FROM lq_kd_pxmx pxmx1
                     INNER JOIN lq_kd_kdjlb kd1 ON pxmx1.glkdbh = kd1.F_Id
@@ -4122,6 +4545,7 @@ namespace NCC.Extend.LqStatistics
                         AND kd1.F_IsEffective = 1
                         AND kd1.Kdhy IS NOT NULL
                         AND kd1.Kdhy != ''
+                        {storeFilterClause}
                         AND NOT EXISTS (
                             -- 排除那些有非女神卡品项的会员
                             SELECT 1
@@ -4133,7 +4557,7 @@ namespace NCC.Extend.LqStatistics
                                 AND pxmx2.px != '61'
                         )";
 
-                var validMemberIds = await _db.Ado.SqlQueryAsync<string>(sql);
+                var validMemberIds = await _db.Ado.SqlQueryAsync<string>(sql, parameters);
 
                 if (!validMemberIds.Any())
                 {
@@ -4299,6 +4723,11 @@ namespace NCC.Extend.LqStatistics
         /// - LeadCustomerId: 线索池客户（拓客编号）
         /// - CustomerName: 客户姓名
         /// - ExpansionTime: 拓客时间
+        /// - StoreId: 归属门店ID（从客户信息表获取）
+        /// - StoreName: 归属门店名称
+        /// - Phone: 电话（优先使用拓客记录的电话，如果没有则使用客户信息表的电话）
+        /// - ExpansionUserId: 拓客人员ID
+        /// - ExpansionUserName: 拓客人员姓名
         /// - HasInvite: 是否邀约（是/否），通过拓客编号关联邀约表
         /// - HasAppointment: 是否预约（是/否），只统计通过邀约产生的预约（预约表的F_InviteId关联邀约表）
         /// - HasConsume: 是否有消耗（是/否），只统计通过预约产生的耗卡（耗卡表的F_AppointmentId关联预约表）
@@ -4319,6 +4748,11 @@ namespace NCC.Extend.LqStatistics
         ///       "LeadCustomerId": "751248448816153862",
         ///       "CustomerName": "王女士",
         ///       "ExpansionTime": "2025-10-24T03:33:10.000Z",
+        ///       "StoreId": "1649328471923847169",
+        ///       "StoreName": "绿纤紫荆店",
+        ///       "Phone": "13800138000",
+        ///       "ExpansionUserId": "123456789",
+        ///       "ExpansionUserName": "张三",
         ///       "HasInvite": "否",
         ///       "HasAppointment": "否",
         ///       "HasConsume": "否",
@@ -4392,6 +4826,16 @@ namespace NCC.Extend.LqStatistics
                         tk.F_Id as LeadCustomerId,
                         tk.F_CustomerName as CustomerName,
                         tk.F_ExpansionTime as ExpansionTime,
+                        -- 归属门店ID（从客户信息表获取）
+                        COALESCE(kh.gsmd, '') as StoreId,
+                        -- 归属门店名称
+                        COALESCE(md.dm, '') as StoreName,
+                        -- 电话（优先使用拓客记录的电话，如果没有则使用客户信息表的电话）
+                        COALESCE(NULLIF(tk.F_CustomerPhone, ''), kh.sjh, '') as Phone,
+                        -- 拓客人员ID
+                        COALESCE(tk.F_ExpansionUserId, '') as ExpansionUserId,
+                        -- 拓客人员姓名
+                        COALESCE(usr.F_REALNAME, '') as ExpansionUserName,
                         -- 是否邀约：通过会员ID关联（邀约表的yykh字段存储的是会员ID）
                         CASE WHEN yaoy_stats.has_invite = 1 THEN '是' ELSE '否' END as HasInvite,
                         -- 是否预约：通过邀约ID关联（只统计通过邀约产生的预约）
@@ -4413,6 +4857,12 @@ namespace NCC.Extend.LqStatistics
                         -- 实际开单记录数（不管是否通过预约产生）
                         COALESCE(kd_actual.count, 0) as ActualBillingCount
                     FROM lq_tkjlb tk
+                    -- 关联客户信息表（获取归属门店和电话）
+                    LEFT JOIN lq_khxx kh ON kh.F_Id = tk.F_MemberId
+                    -- 关联门店表（获取归属门店名称）
+                    LEFT JOIN lq_mdxx md ON md.F_Id = kh.gsmd
+                    -- 关联用户表（获取拓客人员姓名）
+                    LEFT JOIN BASE_USER usr ON usr.F_Id = tk.F_ExpansionUserId AND usr.F_DeleteMark IS NULL
                     -- 邀约统计子查询（通过会员ID关联：邀约表的yykh字段存储的是会员ID）
                     LEFT JOIN (
                         SELECT 
@@ -5020,6 +5470,9 @@ namespace NCC.Extend.LqStatistics
                 var khWhereClause = khWhereConditions.Any() ? "WHERE " + string.Join(" AND ", khWhereConditions) : "WHERE kh.gsmd IS NOT NULL";
                 var khWhereClauseNoAlias = khWhereConditionsNoAlias.Any() ? "WHERE " + string.Join(" AND ", khWhereConditionsNoAlias) : "WHERE gsmd IS NOT NULL";
 
+                // 判断是否有活动筛选
+                var hasEventFilter = !string.IsNullOrEmpty(input.EventId);
+
                 // 使用子查询优化性能，避免复杂的JOIN
                 var sql = $@"
                     SELECT 
@@ -5037,6 +5490,12 @@ namespace NCC.Extend.LqStatistics
                             SELECT gsmd as StoreId FROM lq_khxx {khWhereClauseNoAlias}
                             UNION
                             SELECT F_StoreId as StoreId FROM lq_tkjlb {whereClauseNoAlias}
+                            UNION
+                            SELECT F_StoreId as StoreId FROM lq_yaoyjl WHERE F_StoreId IS NOT NULL
+                            UNION
+                            SELECT djmd as StoreId FROM lq_yyjl WHERE djmd IS NOT NULL
+                            UNION
+                            SELECT djmd as StoreId FROM lq_kd_kdjlb WHERE djmd IS NOT NULL AND F_IsEffective = 1
                         ) as all_stores
                     ) as stores
                     LEFT JOIN lq_mdxx md ON md.F_Id = stores.StoreId
@@ -5058,51 +5517,92 @@ namespace NCC.Extend.LqStatistics
                         {(string.IsNullOrEmpty(whereClause) ? "" : whereClause)}
                         GROUP BY tk.F_StoreId
                     ) tk_stats ON tk_stats.StoreId = stores.StoreId
-                    -- 邀约数统计
+                    -- 邀约数统计（如果有活动筛选，通过拓客记录关联；否则直接统计）
                     LEFT JOIN (
+                        {(hasEventFilter ? @"
                         SELECT 
                             tk.F_StoreId as StoreId,
                             COUNT(DISTINCT yaoy.F_Id) as InviteCount
-                        FROM lq_tkjlb tk
-                        INNER JOIN lq_yaoyjl yaoy ON yaoy.tkbh = tk.F_Id
-                        {(string.IsNullOrEmpty(whereClause) ? "" : whereClause)}
-                        GROUP BY tk.F_StoreId
+                        FROM lq_yaoyjl yaoy
+                        INNER JOIN lq_tkjlb tk ON tk.F_Id = yaoy.tkbh
+                        WHERE tk.F_StoreId IS NOT NULL
+                            AND tk.F_EventId = @EventId
+                        GROUP BY tk.F_StoreId" : @"
+                        SELECT 
+                            yaoy.F_StoreId as StoreId,
+                            COUNT(DISTINCT yaoy.F_Id) as InviteCount
+                        FROM lq_yaoyjl yaoy
+                        WHERE yaoy.F_StoreId IS NOT NULL
+                        GROUP BY yaoy.F_StoreId")}
                     ) yaoy_stats ON yaoy_stats.StoreId = stores.StoreId
-                    -- 预约数统计（通过邀约ID关联）
+                    -- 预约数统计（如果有活动筛选，通过邀约->拓客链路关联；否则直接统计）
                     LEFT JOIN (
+                        {(hasEventFilter ? @"
                         SELECT 
                             tk.F_StoreId as StoreId,
                             COUNT(DISTINCT yy.F_Id) as AppointmentCount
-                        FROM lq_tkjlb tk
-                        INNER JOIN lq_yaoyjl yaoy ON yaoy.tkbh = tk.F_Id
-                        INNER JOIN lq_yyjl yy ON yy.F_InviteId = yaoy.F_Id
-                        {(string.IsNullOrEmpty(whereClause) ? "" : whereClause)}
-                        GROUP BY tk.F_StoreId
+                        FROM lq_yyjl yy
+                        INNER JOIN lq_yaoyjl yaoy ON yaoy.F_Id = yy.F_InviteId
+                        INNER JOIN lq_tkjlb tk ON tk.F_Id = yaoy.tkbh
+                        WHERE tk.F_StoreId IS NOT NULL
+                            AND tk.F_EventId = @EventId
+                        GROUP BY tk.F_StoreId" : @"
+                        SELECT 
+                            yy.djmd as StoreId,
+                            COUNT(DISTINCT yy.F_Id) as AppointmentCount
+                        FROM lq_yyjl yy
+                        WHERE yy.djmd IS NOT NULL
+                        GROUP BY yy.djmd")}
                     ) yy_stats ON yy_stats.StoreId = stores.StoreId
-                    -- 耗卡数统计（通过预约ID关联）
+                    -- 耗卡数统计（如果有活动筛选，通过预约->邀约->拓客链路关联；否则直接统计）
                     LEFT JOIN (
+                        {(hasEventFilter ? @"
                         SELECT 
                             tk.F_StoreId as StoreId,
                             COUNT(DISTINCT xh.F_Id) as ConsumeCount
-                        FROM lq_tkjlb tk
-                        INNER JOIN lq_yaoyjl yaoy ON yaoy.tkbh = tk.F_Id
-                        INNER JOIN lq_yyjl yy ON yy.F_InviteId = yaoy.F_Id
+                        FROM lq_yyjl yy
                         INNER JOIN lq_xh_hyhk xh ON xh.F_AppointmentId = yy.F_Id AND xh.F_IsEffective = 1
-                        {(string.IsNullOrEmpty(whereClause) ? "" : whereClause)}
-                        GROUP BY tk.F_StoreId
+                        INNER JOIN lq_yaoyjl yaoy ON yaoy.F_Id = yy.F_InviteId
+                        INNER JOIN lq_tkjlb tk ON tk.F_Id = yaoy.tkbh
+                        WHERE tk.F_StoreId IS NOT NULL
+                            AND tk.F_EventId = @EventId
+                        GROUP BY tk.F_StoreId" : @"
+                        SELECT 
+                            yy.djmd as StoreId,
+                            COUNT(DISTINCT xh.F_Id) as ConsumeCount
+                        FROM lq_yyjl yy
+                        INNER JOIN lq_xh_hyhk xh ON xh.F_AppointmentId = yy.F_Id AND xh.F_IsEffective = 1
+                        WHERE yy.djmd IS NOT NULL
+                        GROUP BY yy.djmd")}
                     ) xh_stats ON xh_stats.StoreId = stores.StoreId
-                    -- 开单数和开单金额统计（通过预约ID关联）
+                    -- 开单数和开单金额统计（如果有活动筛选，通过预约->邀约->拓客链路关联；否则直接统计）
                     LEFT JOIN (
+                        {(hasEventFilter ? @"
                         SELECT 
                             tk.F_StoreId as StoreId,
                             COUNT(DISTINCT kd.F_Id) as BillingCount,
                             SUM(kd.zdyj) as BillingAmount
-                        FROM lq_tkjlb tk
-                        INNER JOIN lq_yaoyjl yaoy ON yaoy.tkbh = tk.F_Id
-                        INNER JOIN lq_yyjl yy ON yy.F_InviteId = yaoy.F_Id
-                        INNER JOIN lq_kd_kdjlb kd ON kd.F_AppointmentId = yy.F_Id AND kd.F_IsEffective = 1
-                        {(string.IsNullOrEmpty(whereClause) ? "" : whereClause)}
-                        GROUP BY tk.F_StoreId
+                        FROM lq_kd_kdjlb kd
+                        INNER JOIN lq_yyjl yy ON yy.F_Id = kd.F_AppointmentId
+                        INNER JOIN lq_yaoyjl yaoy ON yaoy.F_Id = yy.F_InviteId
+                        INNER JOIN lq_tkjlb tk ON tk.F_Id = yaoy.tkbh
+                        WHERE kd.F_IsEffective = 1 
+                            AND kd.F_AppointmentId IS NOT NULL 
+                            AND kd.F_AppointmentId != ''
+                            AND tk.F_StoreId IS NOT NULL
+                            AND tk.F_EventId = @EventId
+                        GROUP BY tk.F_StoreId" : @"
+                        SELECT 
+                            kd.djmd as StoreId,
+                            COUNT(DISTINCT kd.F_Id) as BillingCount,
+                            SUM(kd.zdyj) as BillingAmount
+                        FROM lq_kd_kdjlb kd
+                        INNER JOIN lq_yyjl yy ON yy.F_Id = kd.F_AppointmentId
+                        WHERE kd.F_IsEffective = 1 
+                            AND kd.F_AppointmentId IS NOT NULL 
+                            AND kd.F_AppointmentId != ''
+                            AND kd.djmd IS NOT NULL
+                        GROUP BY kd.djmd")}
                     ) kd_stats ON kd_stats.StoreId = stores.StoreId
                     WHERE stores.StoreId IS NOT NULL
                     ORDER BY stores.StoreId";
diff --git a/接口调用说明-修改开单信息.md b/接口调用说明-修改开单信息.md
new file mode 100644
index 0000000..7ab7f6b
--- /dev/null
+++ b/接口调用说明-修改开单信息.md
@@ -0,0 +1,201 @@
+# 修改开单信息接口调用说明
+
+## 接口信息
+
+- **接口地址**: `PUT /api/Extend/lqkdkdjlb/UpdateBillingInfo`
+- **请求方式**: `PUT`
+- **Content-Type**: `application/json`
+- **需要认证**: 是（需要在Header中携带Authorization token）
+
+## 请求参数
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | string | 是 | 开单记录ID |
+| scwj | List<FileControlsModel> | 否 | 上传文件列表（不传则不更新） |
+| F_FIleUrl | string | 否 | 方案其他文件URL（不传则不更新） |
+| Bz | string | 否 | 备注（不传则不更新） |
+| Jj | string | 否 | 简介（不传则不更新） |
+
+**注意**: 至少需要提供一个要更新的字段（scwj、F_FIleUrl、Bz或Jj）
+
+## 响应格式
+
+### 成功响应 (200)
+
+```json
+{
+  "code": 200,
+  "msg": "更新成功",
+  "data": {
+    "id": "开单记录ID",
+    "updatedFields": ["Bz", "Jj"]
+  }
+}
+```
+
+### 错误响应
+
+```json
+{
+  "code": 400,
+  "msg": "错误信息",
+  "data": null
+}
+```
+
+## 调用示例
+
+### JavaScript/Axios 示例
+
+```javascript
+import axios from 'axios';
+
+// 更新备注和简介
+const updateBillingInfo = async (billingId, remark, description) => {
+  try {
+    const token = localStorage.getItem('token'); // 从本地存储获取token
+    
+    const response = await axios.put(
+      '/api/Extend/lqkdkdjlb/UpdateBillingInfo',
+      {
+        id: billingId,
+        Bz: remark,      // 备注
+        Jj: description  // 简介
+      },
+      {
+        headers: {
+          'Authorization': token,
+          'Content-Type': 'application/json'
+        }
+      }
+    );
+    
+    if (response.data.code === 200) {
+      console.log('更新成功', response.data.data);
+      return response.data;
+    } else {
+      console.error('更新失败', response.data.msg);
+      throw new Error(response.data.msg);
+    }
+  } catch (error) {
+    console.error('请求失败', error);
+    throw error;
+  }
+};
+
+// 使用示例
+updateBillingInfo('759263766553560325', '这是备注信息', '这是简介信息');
+```
+
+### 只更新备注
+
+```javascript
+const updateRemark = async (billingId, remark) => {
+  const response = await axios.put(
+    '/api/Extend/lqkdkdjlb/UpdateBillingInfo',
+    {
+      id: billingId,
+      Bz: remark
+    },
+    {
+      headers: {
+        'Authorization': localStorage.getItem('token'),
+        'Content-Type': 'application/json'
+      }
+    }
+  );
+  return response.data;
+};
+```
+
+### 只更新简介
+
+```javascript
+const updateDescription = async (billingId, description) => {
+  const response = await axios.put(
+    '/api/Extend/lqkdkdjlb/UpdateBillingInfo',
+    {
+      id: billingId,
+      Jj: description
+    },
+    {
+      headers: {
+        'Authorization': localStorage.getItem('token'),
+        'Content-Type': 'application/json'
+      }
+    }
+  );
+  return response.data;
+};
+```
+
+### 同时更新文件、备注和简介
+
+```javascript
+const updateAll = async (billingId, files, remark, description, fileUrl) => {
+  const response = await axios.put(
+    '/api/Extend/lqkdkdjlb/UpdateBillingInfo',
+    {
+      id: billingId,
+      scwj: files,           // 文件列表
+      F_FIleUrl: fileUrl,    // 方案其他文件URL
+      Bz: remark,            // 备注
+      Jj: description        // 简介
+    },
+    {
+      headers: {
+        'Authorization': localStorage.getItem('token'),
+        'Content-Type': 'application/json'
+      }
+    }
+  );
+  return response.data;
+};
+```
+
+### cURL 示例
+
+```bash
+# 更新备注和简介
+curl -X PUT "http://localhost:2011/api/Extend/lqkdkdjlb/UpdateBillingInfo" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "id": "759263766553560325",
+    "Bz": "这是备注信息",
+    "Jj": "这是简介信息"
+  }'
+
+# 只更新备注
+curl -X PUT "http://localhost:2011/api/Extend/lqkdkdjlb/UpdateBillingInfo" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "id": "759263766553560325",
+    "Bz": "这是备注信息"
+  }'
+
+# 只更新简介
+curl -X PUT "http://localhost:2011/api/Extend/lqkdkdjlb/UpdateBillingInfo" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "id": "759263766553560325",
+    "Jj": "这是简介信息"
+  }'
+```
+
+## 注意事项
+
+1. **服务重启**: 修改代码后需要重启后端服务才能生效
+2. **Token获取**: 需要先调用登录接口获取token
+3. **字段可选**: 所有字段都是可选的，只需要传入要更新的字段即可
+4. **至少一个字段**: 必须至少提供一个要更新的字段，否则会返回错误
+
+## 错误码说明
+
+- `200`: 更新成功
+- `400`: 参数错误或开单记录不存在
+- `500`: 服务器错误
+
--
libgit2 0.21.4