导出

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -928,7 +928,6 @@ namespace Hotline.Api.Controllers.Bi
 				NoEvaluateCount = data.Where(x => x.OrgType == EOrgType.County).Sum(x => x.NoEvaluateCount),
 				NoPutThroughCount = data.Where(x => x.OrgType == EOrgType.County).Sum(x => x.NoPutThroughCount),
 			};
-            data.Add(countySumModel);
 			var citySumModel = new VisitAndOrgSatisfactionStatisticsDto()
 			{
 				OrgName = "市直合计",
@@ -941,7 +940,6 @@ namespace Hotline.Api.Controllers.Bi
 				NoEvaluateCount = data.Where(x => x.OrgType == EOrgType.City).Sum(x => x.NoEvaluateCount),
 				NoPutThroughCount = data.Where(x => x.OrgType == EOrgType.City).Sum(x => x.NoPutThroughCount),
 			};
-			data.Add(citySumModel);
 			var sumModel = new VisitAndOrgSatisfactionStatisticsDto()
 			{
 				OrgName = "总计",
@@ -954,6 +952,8 @@ namespace Hotline.Api.Controllers.Bi
 				NoEvaluateCount = data.Sum(x => x.NoEvaluateCount),
 				NoPutThroughCount = data.Sum(x => x.NoPutThroughCount),
 			};
+			data.Add(countySumModel);
+			data.Add(citySumModel);
 			data.Add(sumModel);
             dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
             var dtos = data
@@ -1042,7 +1042,6 @@ namespace Hotline.Api.Controllers.Bi
 				NoEvaluateCount = list.Where(x => x.OrgType == EOrgType.County).Sum(x => x.NoEvaluateCount),
 				NoPutThroughCount = list.Where(x => x.OrgType == EOrgType.County).Sum(x => x.NoPutThroughCount),
 			};
-			list.Add(countySumModel);
 			var citySumModel = new VisitAndOrgSatisfactionStatisticsDto()
 			{
 				OrgName = "市直合计",
@@ -1055,7 +1054,6 @@ namespace Hotline.Api.Controllers.Bi
 				NoEvaluateCount = list.Where(x => x.OrgType == EOrgType.City).Sum(x => x.NoEvaluateCount),
 				NoPutThroughCount = list.Where(x => x.OrgType == EOrgType.City).Sum(x => x.NoPutThroughCount),
 			};
-			list.Add(citySumModel);
 			var sumModel = new VisitAndOrgSatisfactionStatisticsDto()
 			{
 				OrgName = "总计",
@@ -1068,8 +1066,9 @@ namespace Hotline.Api.Controllers.Bi
 				NoEvaluateCount = list.Sum(x => x.NoEvaluateCount),
 				NoPutThroughCount = list.Sum(x => x.NoPutThroughCount),
 			};
+			list.Add(countySumModel);
+			list.Add(citySumModel);
 			list.Add(sumModel);
-
 			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
 			var dtos = list
 			 .Select(stu => _mapper.Map(stu, typeof(VisitAndOrgSatisfactionStatisticsDto), dynamicClass))