feat: 优化统计功能

- 修复GetStoreDailyStatistics和GetStorePerformanceCompletion，只统计zxzt为'开店'的门店 - 为GetBusinessUnitPerformanceCompletion和GetTianwangGroupPerformanceCompletion添加退卡业绩统计和实际完成业绩计算 - 为GetEmployeePerformanceStatistics添加手工费统计和消耗项目数分类统计（原始、加班、陪同） - 修复ConsumeCount和RefundCount统计逻辑，改为统计消耗单数和退卡单数

feat: 优化统计功能
- 修复GetStoreDailyStatistics和GetStorePerformanceCompletion，只统计zxzt为'开店'的门店 - 为GetBusinessUnitPerformanceCompletion和GetTianwangGroupPerformanceCompletion添加退卡业绩统计和实际完成业绩计算 - 为GetEmployeePerformanceStatistics添加手工费统计和消耗项目数分类统计（原始、加班、陪同） - 修复ConsumeCount和RefundCount统计逻辑，改为统计消耗单数和退卡单数
“wangming”
1 parent 9790054f
Showing 6 changed files with 249 additions and 66 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqDailyReport/BusinessUnitPerformanceCompletionOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqDailyReport/TianwangGroupPerformanceCompletionOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/EmployeePerformanceStatisticsOutput.cs
netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
@@ -24,12 +24,27 @@ namespace NCC.Extend.Entitys.Dto.LqDailyReport
         public decimal TargetPerformance { get; set; }
         /// <summary>
-        /// 完成业绩（管理门店的开单业绩总和）
+        /// 开单业绩（管理门店的开单业绩总和）
+        /// </summary>
+        public decimal BillingPerformance { get; set; }
+
+        /// <summary>
+        /// 退款业绩（退卡业绩总和）
+        /// </summary>
+        public decimal RefundPerformance { get; set; }
+
+        /// <summary>
+        /// 开单业绩（管理门店的开单业绩总和）
+        /// </summary>
+        public decimal ActualPerformance { get; set; }
+
+        /// <summary>
+        /// 实际完成业绩（开单业绩 - 退款业绩）
         /// </summary>
         public decimal CompletedPerformance { get; set; }
         /// <summary>
-        /// 完成率（百分比）
+        /// 完成率（百分比，基于实际完成业绩计算）
         /// </summary>
         public decimal CompletionRate { get; set; }
@@ -24,12 +24,27 @@ namespace NCC.Extend.Entitys.Dto.LqDailyReport
         public decimal TargetPerformance { get; set; }
         /// <summary>
-        /// 完成业绩（管理门店的开单业绩总和）
+        /// 开单业绩（管理门店的开单业绩总和）
+        /// </summary>
+        public decimal BillingPerformance { get; set; }
+
+        /// <summary>
+        /// 退款业绩（退卡业绩总和）
+        /// </summary>
+        public decimal RefundPerformance { get; set; }
+
+        /// <summary>
+        /// 开单业绩（与BillingPerformance相同，用于兼容）
+        /// </summary>
+        public decimal ActualPerformance { get; set; }
+
+        /// <summary>
+        /// 实际完成业绩（开单业绩 - 退款业绩）
         /// </summary>
         public decimal CompletedPerformance { get; set; }
         /// <summary>
-        /// 完成率（百分比）
+        /// 完成率（百分比，基于实际完成业绩计算）
         /// </summary>
         public decimal CompletionRate { get; set; }
@@ -41,7 +41,7 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
         public decimal BillingAmount { get; set; }
         /// <summary>
-        /// 消耗数量
+        /// 消耗单数（消耗主表的去重记录数）
         /// </summary>
         public int ConsumeCount { get; set; }
@@ -51,7 +51,7 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
         public decimal ConsumeAmount { get; set; }
         /// <summary>
-        /// 退卡数量
+        /// 退卡单数量（退卡主表的去重记录数）
         /// </summary>
         public int RefundCount { get; set; }
@@ -76,8 +76,28 @@ namespace NCC.Extend.Entitys.Dto.LqStatistics
         public int BillingProjectCount { get; set; }
         /// <summary>
-        /// 消耗项目数（项目次数总和）
+        /// 消耗项目数（项目次数总和，包含原始+加班+陪同）
         /// </summary>
         public int ConsumeProjectCount { get; set; }
+
+        /// <summary>
+        /// 消耗原始项目数（原始项目次数总和）
+        /// </summary>
+        public decimal ConsumeOriginalProjectCount { get; set; }
+
+        /// <summary>
+        /// 消耗加班项目数（加班项目次数总和）
+        /// </summary>
+        public decimal ConsumeOvertimeProjectCount { get; set; }
+
+        /// <summary>
+        /// 消耗陪同项目数（陪同项目次数总和）
+        /// </summary>
+        public decimal ConsumeAccompaniedProjectCount { get; set; }
+
+        /// <summary>
+        /// 手工费（消耗手工费总和）
+        /// </summary>
+        public decimal LaborCost { get; set; }
     }
 }
@@ -125,7 +125,7 @@ namespace NCC.Extend
                 storeFilter = $"AND consume.Md IN ('{storeIdsStr}')";
             }
-            // SQL查询：获取门店每日运营数据
+            // SQL查询：获取门店每日运营数据（只统计zxzt为"开店"的门店）
             var sql = $@"
                 SELECT 
                     consume.Md as StoreId,
@@ -148,7 +148,7 @@ namespace NCC.Extend
                     -- 消耗业绩（总金额）
                     COALESCE(SUM(project.F_TotalPrice), 0) as ConsumePerformance
                 FROM lq_xh_hyhk consume
-                LEFT JOIN lq_mdxx store ON consume.Md = store.F_Id
+                INNER JOIN lq_mdxx store ON consume.Md = store.F_Id AND store.zxzt = '开店'
                 LEFT JOIN lq_xh_pxmx project ON consume.F_Id = project.F_ConsumeInfoId AND project.F_IsEffective = 1
                 WHERE consume.F_IsEffective = 1
                     AND DATE(consume.Hksj) >= '{startDate:yyyy-MM-dd}'
@@ -227,7 +227,7 @@ namespace NCC.Extend
                 storeFilter = $"AND store.F_Id IN ('{storeIdsStr}')";
             }
-            // SQL查询：获取门店业绩完成情况
+            // SQL查询：获取门店业绩完成情况（只统计zxzt为"开店"的门店）
             var sql = $@"
                 SELECT 
                     store.F_Id as StoreId,
@@ -254,7 +254,7 @@ namespace NCC.Extend
                     ), 0) as RefundPerformance
                 FROM lq_mdxx store
                 LEFT JOIN lq_md_target target ON target.F_StoreId = store.F_Id AND target.F_Month = '{month}'
-                WHERE 1=1 {storeFilter}
+                WHERE store.zxzt = '开店' {storeFilter}
                 ORDER BY (BillingPerformance - RefundPerformance) DESC";
             var result = await _db.Ado.SqlQueryAsync<dynamic>(sql);
@@ -289,7 +289,7 @@ namespace NCC.Extend
         /// 获取事业部业绩完成情况
         /// </summary>
         /// <remarks>
-        /// 根据指定日期统计各事业部的业绩完成情况，包括目标业绩、完成业绩、完成率
+        /// 根据指定日期统计各事业部的业绩完成情况，包括目标业绩、开单业绩、退卡金额、实际完成业绩、完成率
         /// 
         /// 示例请求：
         /// ```json
@@ -309,7 +309,10 @@ namespace NCC.Extend
         /// - BusinessUnitId: 事业部ID
         /// - BusinessUnitName: 事业部名称
         /// - TargetPerformance: 目标业绩（来自门店目标表lq_md_target的F_BusinessUnitTarget字段，根据开始时间所在月份获取，通过F_BusinessUnit字段关联，如果未查询到则为0）
-        /// - CompletedPerformance: 完成业绩（指定时间范围内的开单业绩总和）
+        /// - BillingPerformance: 开单业绩（指定时间范围内的开单业绩总和）
+        /// - RefundPerformance: 退款业绩（指定时间范围内的退卡业绩总和）
+        /// - ActualPerformance: 开单业绩（与BillingPerformance相同，用于兼容）
+        /// - CompletedPerformance: 实际完成业绩（开单业绩 - 退款业绩）
         /// - CompletionRate: 完成率（百分比，CompletedPerformance / TargetPerformance * 100）
         /// - StoreCount: 门店数量（根据门店目标表中归属该事业部的门店数统计）
         /// </remarks>
@@ -368,20 +371,23 @@ namespace NCC.Extend
                     BusinessUnitId = unit.BusinessUnitId.ToString(),
                     BusinessUnitName = unit.BusinessUnitName.ToString(),
                     TargetPerformance = Convert.ToDecimal(unit.TargetPerformance),
+                    BillingPerformance = 0,
+                    RefundPerformance = 0,
+                    ActualPerformance = 0,
                     CompletedPerformance = 0,
                     CompletionRate = 0,
                     StoreCount = Convert.ToInt32(unit.StoreCount)
                 };
             }
-            // 第二步：统计各事业部的完成业绩
+            // 第二步：统计各事业部的开单业绩
             var businessUnitIds = businessUnitDict.Keys.ToList();
             var unitIdsStr = string.Join("','", businessUnitIds);
-            var completedPerformanceSql = $@"
+            var billingPerformanceSql = $@"
                 SELECT 
                     store.syb as BusinessUnitId,
-                    COALESCE(SUM(billing.sfyj), 0) as CompletedPerformance
+                    COALESCE(SUM(billing.sfyj), 0) as BillingPerformance
                 FROM lq_kd_kdjlb billing
                 INNER JOIN lq_mdxx store ON billing.djmd = store.F_Id
                 INNER JOIN base_organize o ON store.syb = o.F_Id
@@ -394,28 +400,58 @@ namespace NCC.Extend
                     AND store.syb IN ('{unitIdsStr}')
                 GROUP BY store.syb";
-            var completedPerformanceData = await _db.Ado.SqlQueryAsync<dynamic>(completedPerformanceSql);
+            var billingPerformanceData = await _db.Ado.SqlQueryAsync<dynamic>(billingPerformanceSql);
+
+            // 第三步：统计各事业部的退卡金额
+            var refundPerformanceSql = $@"
+                SELECT 
+                    store.syb as BusinessUnitId,
+                    COALESCE(SUM(refund.F_ActualRefundAmount), 0) as RefundPerformance
+                FROM lq_hytk_hytk refund
+                INNER JOIN lq_mdxx store ON refund.md = store.F_Id
+                INNER JOIN base_organize o ON store.syb = o.F_Id
+                WHERE refund.F_IsEffective = 1
+                    AND o.F_Category = 'department'
+                    AND (o.F_DeleteMark IS NULL OR o.F_DeleteMark != 1)
+                    AND o.F_FullName IN ('事业一部', '事业二部', '事业三部', '事业四部', '事业五部', '事业六部')
+                    AND DATE(refund.tksj) >= '{startDate:yyyy-MM-dd}'
+                    AND DATE(refund.tksj) <= '{endDate:yyyy-MM-dd}'
+                    AND store.syb IN ('{unitIdsStr}')
+                GROUP BY store.syb";
+
+            var refundPerformanceData = await _db.Ado.SqlQueryAsync<dynamic>(refundPerformanceSql);
-            // 第三步：合并数据并计算完成率
-            foreach (var item in completedPerformanceData)
+            // 第四步：合并开单业绩数据
+            foreach (var item in billingPerformanceData)
             {
                 var businessUnitId = item.BusinessUnitId.ToString();
                 if (businessUnitDict.ContainsKey(businessUnitId))
                 {
-                    var completedPerformance = Convert.ToDecimal(item.CompletedPerformance);
-                    var unit = businessUnitDict[businessUnitId];
-                    unit.CompletedPerformance = completedPerformance;
-
-                    var completionRate = unit.TargetPerformance > 0
-                        ? (completedPerformance / unit.TargetPerformance * 100m)
-                        : 0m;
-                    unit.CompletionRate = decimal.Round(completionRate, 2);
+                    businessUnitDict[businessUnitId].BillingPerformance = Convert.ToDecimal(item.BillingPerformance);
                 }
             }
-            var outputList = businessUnitDict.Values
-                .OrderByDescending(x => x.CompletedPerformance)
-                .ToList();
+            // 第五步：合并退卡金额数据
+            foreach (var item in refundPerformanceData)
+            {
+                var businessUnitId = item.BusinessUnitId.ToString();
+                if (businessUnitDict.ContainsKey(businessUnitId))
+                {
+                    businessUnitDict[businessUnitId].RefundPerformance = Convert.ToDecimal(item.RefundPerformance);
+                }
+            }
+
+            // 第六步：计算实际完成业绩和完成率
+            foreach (var unit in businessUnitDict.Values)
+            {
+                unit.ActualPerformance = unit.BillingPerformance; // 开单业绩
+                var actualCompletedPerformance = unit.BillingPerformance - unit.RefundPerformance; // 实际完成业绩
+                unit.CompletedPerformance = actualCompletedPerformance; // 实际完成业绩
+                var completionRate = unit.TargetPerformance > 0 ? (actualCompletedPerformance / unit.TargetPerformance * 100m) : 0m;
+                unit.CompletionRate = decimal.Round(completionRate, 2);
+            }
+
+            var outputList = businessUnitDict.Values.OrderByDescending(x => x.CompletedPerformance).ToList();
             return outputList;
         }
@@ -426,7 +462,7 @@ namespace NCC.Extend
         /// 获取天王团业绩完成情况
         /// </summary>
         /// <remarks>
-        /// 根据指定日期统计各天王团的业绩完成情况，包括目标业绩、完成业绩、完成率
+        /// 根据指定日期统计各天王团的业绩完成情况，包括目标业绩、开单业绩、退卡金额、实际完成业绩、完成率
         /// 
         /// 示例请求：
         /// ```json
@@ -446,7 +482,10 @@ namespace NCC.Extend
         /// - DepartmentId: 部门ID
         /// - DepartmentName: 部门名称（教育一部、教育二部、科技一部、科技二部、大项目一部、大项目二部）
         /// - TargetPerformance: 目标业绩（来自门店目标表lq_md_target，根据部门类型使用对应字段：教育部使用F_EducationDepartmentTarget，科技部使用F_TechDepartmentTarget，大项目部使用F_MajorProjectDepartmentTarget，根据开始时间所在月份获取，通过对应归属字段关联，如果未查询到则为0）
-        /// - CompletedPerformance: 完成业绩（指定时间范围内的开单业绩总和）
+        /// - BillingPerformance: 开单业绩（指定时间范围内的开单业绩总和）
+        /// - RefundPerformance: 退款业绩（指定时间范围内的退卡业绩总和）
+        /// - ActualPerformance: 开单业绩（与BillingPerformance相同，用于兼容）
+        /// - CompletedPerformance: 实际完成业绩（开单业绩 - 退款业绩）
         /// - CompletionRate: 完成率（百分比，CompletedPerformance / TargetPerformance * 100）
         /// - StoreCount: 门店数量（根据门店目标表中归属该部门的门店数统计）
         /// </remarks>
@@ -517,6 +556,9 @@ namespace NCC.Extend
                             DepartmentId = dept.DepartmentId.ToString(),
                             DepartmentName = dept.DepartmentName.ToString(),
                             TargetPerformance = Convert.ToDecimal(dept.TargetPerformance),
+                            BillingPerformance = 0,
+                            RefundPerformance = 0,
+                            ActualPerformance = 0,
                             CompletedPerformance = 0,
                             CompletionRate = 0,
                             StoreCount = Convert.ToInt32(dept.StoreCount)
@@ -530,14 +572,14 @@ namespace NCC.Extend
                 return new List<TianwangGroupPerformanceCompletionOutput>();
             }
-            // 第二步：统计各天王团的完成业绩（直接按部门ID统计，避免重复计算）
+            // 第二步：统计各天王团的开单业绩（直接按部门ID统计，避免重复计算）
             var deptIdsStrForQuery = string.Join("','", departmentDict.Keys);
             // 使用 OR 条件连接三个部门类型字段，确保每个开单记录只被统计一次到对应的部门
-            var completedPerformanceSql = $@"
+            var billingPerformanceSql = $@"
                 SELECT 
                     o.F_Id as DepartmentId,
-                    COALESCE(SUM(billing.sfyj), 0) as CompletedPerformance
+                    COALESCE(SUM(billing.sfyj), 0) as BillingPerformance
                 FROM lq_kd_kdjlb billing
                 INNER JOIN lq_mdxx store ON billing.djmd = store.F_Id
                 INNER JOIN base_organize o ON (
@@ -553,35 +595,63 @@ namespace NCC.Extend
                     AND o.F_Id IN ('{deptIdsStrForQuery}')
                 GROUP BY o.F_Id";
-            var completedPerformanceData = await _db.Ado.SqlQueryAsync<dynamic>(completedPerformanceSql);
+            var billingPerformanceData = await _db.Ado.SqlQueryAsync<dynamic>(billingPerformanceSql);
+
+            // 第三步：统计各天王团的退卡金额
+            var refundPerformanceSql = $@"
+                SELECT 
+                    o.F_Id as DepartmentId,
+                    COALESCE(SUM(refund.F_ActualRefundAmount), 0) as RefundPerformance
+                FROM lq_hytk_hytk refund
+                INNER JOIN lq_mdxx store ON refund.md = store.F_Id
+                INNER JOIN base_organize o ON (
+                    (store.jyb = o.F_Id AND o.F_FullName IN ('教育一部', '教育二部'))
+                    OR (store.kjb = o.F_Id AND o.F_FullName IN ('科技一部', '科技二部'))
+                    OR (store.dxmb = o.F_Id AND o.F_FullName IN ('大项目一部', '大项目二部'))
+                )
+                WHERE refund.F_IsEffective = 1
+                    AND o.F_Category = 'department'
+                    AND (o.F_DeleteMark IS NULL OR o.F_DeleteMark != 1)
+                    AND DATE(refund.tksj) >= '{startDate:yyyy-MM-dd}'
+                    AND DATE(refund.tksj) <= '{endDate:yyyy-MM-dd}'
+                    AND o.F_Id IN ('{deptIdsStrForQuery}')
+                GROUP BY o.F_Id";
+
+            var refundPerformanceData = await _db.Ado.SqlQueryAsync<dynamic>(refundPerformanceSql);
-            // 第三步：将完成业绩数据填充到部门字典中
-            var departmentPerformanceDict = new Dictionary<string, decimal>();
-            if (completedPerformanceData != null)
+            // 第四步：合并开单业绩数据
+            foreach (var item in billingPerformanceData ?? Enumerable.Empty<dynamic>())
             {
-                foreach (var item in completedPerformanceData)
+                var departmentId = item.DepartmentId.ToString();
+                if (departmentDict.ContainsKey(departmentId))
                 {
-                    var departmentId = item.DepartmentId.ToString();
-                    var completedPerformance = Convert.ToDecimal(item.CompletedPerformance);
-                    departmentPerformanceDict[departmentId] = completedPerformance;
+                    departmentDict[departmentId].BillingPerformance = Convert.ToDecimal(item.BillingPerformance);
                 }
             }
-            // 计算完成率
-            foreach (var kvp in departmentPerformanceDict)
+            // 第五步：合并退卡金额数据
+            foreach (var item in refundPerformanceData ?? Enumerable.Empty<dynamic>())
             {
-                if (departmentDict.ContainsKey(kvp.Key))
+                var departmentId = item.DepartmentId.ToString();
+                if (departmentDict.ContainsKey(departmentId))
                 {
-                    var dept = departmentDict[kvp.Key];
-                    dept.CompletedPerformance = kvp.Value;
-
-                    var completionRate = dept.TargetPerformance > 0
-                        ? (kvp.Value / dept.TargetPerformance * 100m)
-                        : 0m;
-                    dept.CompletionRate = decimal.Round(completionRate, 2);
+                    departmentDict[departmentId].RefundPerformance = Convert.ToDecimal(item.RefundPerformance);
                 }
             }
+            // 第六步：计算实际完成业绩和完成率
+            foreach (var dept in departmentDict.Values)
+            {
+                dept.ActualPerformance = dept.BillingPerformance; // 开单业绩
+                var actualCompletedPerformance = dept.BillingPerformance - dept.RefundPerformance; // 实际完成业绩
+                dept.CompletedPerformance = actualCompletedPerformance; // 实际完成业绩
+
+                var completionRate = dept.TargetPerformance > 0
+                    ? (actualCompletedPerformance / dept.TargetPerformance * 100m)
+                    : 0m;
+                dept.CompletionRate = decimal.Round(completionRate, 2);
+            }
+
             var outputList = departmentDict.Values
                 .OrderByDescending(x => x.CompletedPerformance)
                 .ToList();
@@ -361,6 +361,7 @@ namespace NCC.Extend.LqMdxx
         public async Task<dynamic> GetSelector()
         {
             var list = await _db.Queryable<LqMdxxEntity>()
+                .Where(it => it.Zxzt == "开店")
                 .Select(it => new { id = it.Id, fullName = it.Dm, enCode = it.Mdbm })
                 .ToListAsync();
             return new { list = list };
@@ -3495,13 +3495,17 @@ namespace NCC.Extend.LqStatistics
         /// - BillingCount: 开单数量
         /// - BillingAmount: 开单金额
         /// - BillingProjectCount: 开单项目数（项目次数总和）
-        /// - ConsumeCount: 消耗数量
+        /// - ConsumeCount: 消耗单数（消耗主表的去重记录数）
         /// - ConsumeAmount: 消耗金额
-        /// - ConsumeProjectCount: 消耗项目数（项目次数总和）
-        /// - RefundCount: 退卡数量
+        /// - ConsumeProjectCount: 消耗项目数（项目次数总和，包含原始+加班+陪同）
+        /// - ConsumeOriginalProjectCount: 消耗原始项目数（原始项目次数总和）
+        /// - ConsumeOvertimeProjectCount: 消耗加班项目数（加班项目次数总和）
+        /// - ConsumeAccompaniedProjectCount: 消耗陪同项目数（陪同项目次数总和）
+        /// - RefundCount: 退卡单数量
         /// - RefundAmount: 退卡金额
         /// - HeadCount: 人头（月度去重客户数）
         /// - PersonCount: 人次（日度去重客户数）
+        /// - LaborCost: 手工费（消耗手工费总和）
         /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>员工业绩统计数据</returns>
@@ -3549,8 +3553,11 @@ namespace NCC.Extend.LqStatistics
                 // 9. 开单项目数统计
                 var billingProjectCount = await GetBillingProjectCount(input.UserId, statisticsMonth);
-                // 10. 消耗项目数统计
-                var consumeProjectCount = await GetConsumeProjectCount(input.UserId, statisticsMonth);
+                // 10. 消耗项目数统计（包含总项目数、原始项目数、加班项目数、陪同项目数）
+                var consumeProjectStats = await GetConsumeProjectCountDetails(input.UserId, statisticsMonth);
+
+                // 11. 手工费统计
+                var laborCost = await GetLaborCost(input.UserId, statisticsMonth);
                 return new EmployeePerformanceStatisticsOutput
                 {
@@ -3568,7 +3575,11 @@ namespace NCC.Extend.LqStatistics
                     HeadCount = headCount,
                     PersonCount = personCount,
                     BillingProjectCount = billingProjectCount,
-                    ConsumeProjectCount = consumeProjectCount
+                    ConsumeProjectCount = consumeProjectStats.TotalCount,
+                    ConsumeOriginalProjectCount = consumeProjectStats.OriginalCount,
+                    ConsumeOvertimeProjectCount = consumeProjectStats.OvertimeCount,
+                    ConsumeAccompaniedProjectCount = consumeProjectStats.AccompaniedCount,
+                    LaborCost = laborCost
                 };
             }
             catch (Exception ex)
@@ -3647,9 +3658,10 @@ namespace NCC.Extend.LqStatistics
         /// </summary>
         private async Task<(int Count, decimal Amount)> GetConsumeStats(string userId, string month)
         {
+            // 统计消耗单数（消耗主表的去重记录数）和消耗金额（健康师业绩总和）
             var sql = $@"
                 SELECT 
-                    COUNT(*) as Count,
+                    COUNT(DISTINCT hyhk.F_Id) as Count,
                     COALESCE(SUM(jksyj.jksyj), 0) as Amount
                 FROM lq_xh_jksyj jksyj
                 INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id
@@ -3668,14 +3680,17 @@ namespace NCC.Extend.LqStatistics
         /// </summary>
         private async Task<(int Count, decimal Amount)> GetRefundStats(string userId, string month)
         {
+            // 统计退卡单数（退卡主表的去重记录数）和退卡金额（健康师业绩总和）
             var sql = $@"
                 SELECT 
-                    COUNT(*) as Count,
-                    COALESCE(SUM(jksyj), 0) as Amount
-                FROM lq_hytk_jksyj
-                WHERE jkszh = '{userId}'
-                    AND F_IsEffective = 1
-                    AND DATE_FORMAT(tksj, '%Y%m') = '{month}'";
+                    COUNT(DISTINCT hytk.F_Id) as Count,
+                    COALESCE(SUM(jksyj.jksyj), 0) as Amount
+                FROM lq_hytk_jksyj jksyj
+                INNER JOIN lq_hytk_hytk hytk ON jksyj.gltkbh = hytk.F_Id
+                WHERE jksyj.jkszh = '{userId}'
+                    AND jksyj.F_IsEffective = 1
+                    AND hytk.F_IsEffective = 1
+                    AND DATE_FORMAT(hytk.tksj, '%Y%m') = '{month}'";
             var result = await _db.Ado.SqlQueryAsync<dynamic>(sql);
             var data = result.FirstOrDefault();
@@ -3754,6 +3769,53 @@ namespace NCC.Extend.LqStatistics
             return Convert.ToInt32(result.FirstOrDefault()?.Count ?? 0);
         }
+        /// <summary>
+        /// 统计消耗项目数详情（包含总项目数、原始项目数、加班项目数、陪同项目数）
+        /// </summary>
+        private async Task<(int TotalCount, decimal OriginalCount, decimal OvertimeCount, decimal AccompaniedCount)> GetConsumeProjectCountDetails(string userId, string month)
+        {
+            var sql = $@"
+                SELECT 
+                    COALESCE(SUM(pxmx.F_ProjectNumber), 0) as TotalCount,
+                    COALESCE(SUM(COALESCE(pxmx.F_OriginalProjectNumber, pxmx.F_ProjectNumber)), 0) as OriginalCount,
+                    COALESCE(SUM(COALESCE(pxmx.F_OvertimeProjectNumber, 0)), 0) as OvertimeCount,
+                    COALESCE(SUM(COALESCE(jksyj.F_AccompaniedProjectNumber, 0)), 0) as AccompaniedCount
+                FROM lq_xh_jksyj jksyj
+                INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id
+                INNER JOIN lq_xh_pxmx pxmx ON pxmx.F_ConsumeInfoId = hyhk.F_Id
+                WHERE jksyj.jkszh = '{userId}'
+                    AND jksyj.F_IsEffective = 1
+                    AND hyhk.F_IsEffective = 1
+                    AND DATE_FORMAT(hyhk.hksj, '%Y%m') = '{month}'";
+
+            var result = await _db.Ado.SqlQueryAsync<dynamic>(sql);
+            var data = result.FirstOrDefault();
+            return (
+                Convert.ToInt32(data?.TotalCount ?? 0),
+                Convert.ToDecimal(data?.OriginalCount ?? 0),
+                Convert.ToDecimal(data?.OvertimeCount ?? 0),
+                Convert.ToDecimal(data?.AccompaniedCount ?? 0)
+            );
+        }
+
+        /// <summary>
+        /// 统计手工费（消耗手工费总和）
+        /// </summary>
+        private async Task<decimal> GetLaborCost(string userId, string month)
+        {
+            var sql = $@"
+                SELECT COALESCE(SUM(jksyj.F_LaborCost), 0) as LaborCost
+                FROM lq_xh_jksyj jksyj
+                INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id
+                WHERE jksyj.jkszh = '{userId}'
+                    AND jksyj.F_IsEffective = 1
+                    AND hyhk.F_IsEffective = 1
+                    AND DATE_FORMAT(hyhk.hksj, '%Y%m') = '{month}'";
+
+            var result = await _db.Ado.SqlQueryAsync<dynamic>(sql);
+            return Convert.ToDecimal(result.FirstOrDefault()?.LaborCost ?? 0);
+        }
+
         #endregion
     }
 }