src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -101,16 +101,8 @@ namespace Hotline.Application.StatisticalReport
 
             strSql = string.Format(strSql, dto.StartTime, dto.EndTime, strWhere, orgLength, isOrg, orgName);
 
-            var list = _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
-            if (list != null)
-            {
-                foreach (var item in list)
-                {
-                    item.YbOrderCountNum = item.YbOrderCountNum + item.DelayEnd;
-                    item.ZbOrderCountNum = item.ZbOrderCountNum + item.DelayWait;
-                }
-            }
-            return list;
+            return _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
+           
         }
 
         /// <summary>
@@ -146,16 +138,8 @@ namespace Hotline.Application.StatisticalReport
 
             strSql = string.Format(strSql, dto.StartTime, dto.EndTime, strWhere, orgLength, isOrg, orgName);
 
-            var list = _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
-            if (list != null)
-            {
-                foreach (var item in list)
-                {
-                    item.YbOrderCountNum += item.DelayEnd;
-                    item.ZbOrderCountNum += item.DelayWait;
-                }
-            }
-            return list;
+            return _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
+          
         }
 
         /// <summary>
@@ -354,7 +338,8 @@ namespace Hotline.Application.StatisticalReport
                     query = _workflowTraceRepository.Queryable()
                            .LeftJoin<Order>((t, o) => t.ExternalId == o.Id)
                             .Where((t, o) => t.ModuleCode == WorkflowModuleConsts.OrderHandle && o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime
-                            && t.Status >= EWorkflowStepStatus.Handled && t.CountersignPosition > ECountersignPosition.None)//&& t.TraceState != EWorkflowTraceState.StepRemoveByPrevious
+                            && t.Status >= EWorkflowStepStatus.Handled && t.CountersignPosition > ECountersignPosition.None
+                            && t.TraceState != EWorkflowTraceState.StepRemoveByPrevious)
                             .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, (t, o) => o.Source == ESource.ProvinceStraight)
                               .WhereIF(dto.TypeId != null && dto.TypeId == 1, (t, o) => o.IdentityType == EIdentityType.Citizen)
                          .WhereIF(dto.TypeId != null && dto.TypeId == 2, (t, o) => o.IdentityType == EIdentityType.Enterprise)