diff --git a/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs
index a15b337..7671f26 100644
--- a/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs
+++ b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs
@@ -52,7 +52,7 @@ namespace DOAN.Service.MES.SmartScreen.Order
 			List<OrderProgressDto> orderProgressDtos = new List<OrderProgressDto>();
 
 			// TODO 获取全部的订单计划表 （条件记得放回去）
-			List<OrderPurchase> orderPurchaseList = Queryable().ToList();
+			List<OrderPurchase> orderPurchaseList = Queryable().Where(o=>o.Orderindicator != 1).ToList();
 			List<string> ordernomes = new List<string>();
 			ordernomes=orderPurchaseList.Select(o=>o.OrderNoMes).Distinct().ToList();
 
diff --git a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
index 9dcc868..6509daa 100644
--- a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
+++ b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
@@ -109,12 +109,12 @@ namespace DOAN.Service.MES.SmartScreen.Quality
 			// 使用 SqlSugar 进行联表查询和分组统计
 			var result = Context.Queryable<QcFinishedproductDefectCollection>()
 				.Where(defect => defect.CheckDatetime >= startOfWeek && defect.CheckDatetime <= endOfWeek)
-				.GroupBy(defect => new { defect.DefectCode })
+				.GroupBy(defect => new { defect.DefectCode, defect.DefectName })
 				.OrderBy(defect => new { defect.DefectCode })
 				.Select(defect => new EchartsSeriesData
 				{
 
-					Name = defect.DefectName,
+					Name = SqlFunc.AggregateMax(defect.DefectName),
 					Value = Convert.ToDecimal(SqlFunc.AggregateSum(defect.Number))
 				})
 				.ToList();
@@ -142,7 +142,7 @@ namespace DOAN.Service.MES.SmartScreen.Quality
 				.Select(defect => new EchartsSeriesData
 				{
 
-					Name = defect.DefectName,
+					Name = SqlFunc.AggregateMax(defect.DefectName),
 					Value = Convert.ToDecimal(SqlFunc.AggregateSum(defect.Number))
 				})
 				.ToList();