排序

performance/Performance.Services/NewExtractService.cs

@@ -404,7 +404,7 @@ private void WriteWorkload(ISheet sheet, int hospitalId, List<AccountUnitEntity>
                 if (category == null || category.Count() == 0) continue;
                 foreach (var moditem in category)
                 {
-                    LogHelper.Information($"执行SQL脚本获取数据 -- {module.ModuleName}，", "提取绩效数据");
+                    LogHelper.Information($"执行SQL脚本获取数据 -- {moditem.ItemName}，", "提取绩效数据");
                     var result = QueryDatabase(hospitalConfigList, item, allot, moditem.ItemName);
                     if (result != null)
                         allExtract.AddRange(result);
@@ -548,7 +548,7 @@ private void WriteEmployee(ISheet sheet, int allotLastId, IPerSheetDataRead shee
                 { "调节系数", (t) => t.Adjust },
             };
 
-            var dataList = perforImemployeeRepository.GetEntities(t => t.AllotID == allotLastId);
+            var dataList = perforImemployeeRepository.GetEntities(t => t.AllotID == allotLastId)?.OrderBy(t => t.AccountingUnit).ToList();
             for (int i = 0; i < dataList.Count; i++)
             {
                 var headIndex = sheetRead.Point.HeaderFirstRowNum;
@@ -672,7 +672,7 @@ private void WriteAccountBasic(ISheet sheet, int allotLastId, IPerSheetDataRead
                 { "调节系数", (t) => t.DoctorAdjustFactor },
             };
 
-            var dataList = perforImaccountbasicRepository.GetEntities(t => t.AllotID == allotLastId);
+            var dataList = perforImaccountbasicRepository.GetEntities(t => t.AllotID == allotLastId)?.OrderBy(t => t.UnitType).ThenBy(t => t.DoctorAccountingUnit).ToList();
             for (int i = 0; i < dataList.Count; i++)
             {
                 var headIndex = sheetRead.Point.HeaderFirstRowNum;