diff --git a/DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx b/DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx
index 1f824e2..284ba96 100644
Binary files a/DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx and b/DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx differ
diff --git a/DOAN.Service/MES/product/ProPlanAchievementrateService.cs b/DOAN.Service/MES/product/ProPlanAchievementrateService.cs
index 5b9cadd..8969ad0 100644
--- a/DOAN.Service/MES/product/ProPlanAchievementrateService.cs
+++ b/DOAN.Service/MES/product/ProPlanAchievementrateService.cs
@@ -58,11 +58,12 @@ namespace DOAN.Service.MES.product
             List<ProPlanAchievementrate> AproPlanAchievementrates = Context.Queryable<ProWorkorder>()
                   .LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder)
                   .Where((w, r) => w.WorkorderDate == parm.GenarateDate && w.AorBgroup == "A")
-                  .GroupBy((w, r) => new { w.Project, w.AorBgroup, w.Groupleader })
+                  .GroupBy((w, r) => new { w.Project, w.AorBgroup})
                   .Select((w, r) => new ProPlanAchievementrate()
                   {
                       Project = w.Project,
                       AgroupProductNum = SqlFunc.AggregateSum(r.FinishedNum),
+                      AgroupMonitor=SqlFunc.AggregateMax(w.Groupleader),
                       AgroupPlanNum = SqlFunc.AggregateSum(w.DeliveryNum),
                       AgroupCompletionRate = SqlFunc.Round<decimal>((decimal)(SqlFunc.AggregateSum(r.FinishedNum) / SqlFunc.AggregateSum(w.DeliveryNum)), 2) * 100,
                       //BgroupProductNum = SqlFunc.AggregateSum(r.FinishedNum),
@@ -86,6 +87,7 @@ namespace DOAN.Service.MES.product
                 //AgroupCompletionRate = SqlFunc.Round<decimal>((decimal)(SqlFunc.AggregateSum(r.FinishedNum) / SqlFunc.AggregateSum(w.DeliveryNum)), 2) * 100,
                 BgroupProductNum = SqlFunc.AggregateSum(r.FinishedNum),
                 BgroupPlanNum = SqlFunc.AggregateSum(w.DeliveryNum),
+                BgroupMonitor = SqlFunc.AggregateMax(w.Groupleader),
                 BgroupCompletionRate = SqlFunc.Round<decimal>((decimal)(SqlFunc.AggregateSum(r.FinishedNum) / SqlFunc.AggregateSum(w.DeliveryNum)), 2) * 100,
                 SummaryActualNum = SqlFunc.AggregateSum(r.FinishedNum),
                 SummaryPlanNum = SqlFunc.AggregateSum(w.DeliveryNum),
@@ -108,11 +110,13 @@ namespace DOAN.Service.MES.product
                     AgroupProductNum = a.AgroupProductNum,
                     AgroupPlanNum = a.AgroupPlanNum,
                     AgroupCompletionRate = a.AgroupCompletionRate,
+                    AgroupMonitor=a.AgroupMonitor,
 
                     // B 组数据
                     BgroupProductNum = b.BgroupProductNum,
                     BgroupPlanNum = b.BgroupPlanNum,
                     BgroupCompletionRate = b.BgroupCompletionRate,
+                    BgroupMonitor=b.BgroupMonitor,
 
                     // 汇总数据
                     SummaryActualNum = (a.SummaryActualNum ?? 0) + (b.SummaryActualNum ?? 0),