运营分析增加排序

performance/Performance.Services/ReportService.cs

@@ -432,6 +432,12 @@ public SheetExportResponse Operation(ReportRequest request)
             {
                 sql += " and accountingunit in @accountingunit";
             }
+            sql += @"
+                 order by hospitalid, year,
+				 field(left(sourcetype, 6), '收入', '支出', '费用分析', '业务指标', '效率指标', '人员绩效情况'),
+				 field(left(category, 5), '收入结构', '门诊/住院', '核算收入', '住院部分', '门诊部分', '医生组', '护理组'), 
+				 itemname ";
+
             var data = perforReportRepository.DapperQuery<view_operation_report_result>(sql, new { hospitalId = request.HospitalId, year = years, accountingunit = request.AccountingUnit })?.ToList();
 
             #endregion
@@ -513,19 +519,19 @@ public SheetExportResponse Operation(ReportRequest request)
             int rownumber = 0;
             int maxPointIndex = 0;
             List<Row> rows = new List<Row>();
-            foreach (var sourcetype in sourcetypes.OrderBy(t => t))
+            foreach (var sourcetype in sourcetypes)
             {
                 int inittype = 0;   // 0加载sourcetype、category; 1加载category; 2不加载sourcetype、category
 
                 var sourcetypeData = data.Where(t => t.SourceType == sourcetype);
                 if (sourcetypeData == null || !sourcetypeData.Any()) continue;
 
-                foreach (var category in sourcetypeData.Select(t => t.Category).Distinct().OrderBy(t => t))
+                foreach (var category in sourcetypeData.Select(t => t.Category).Distinct())
                 {
                     var categoryData = sourcetypeData.Where(t => t.Category == category);
                     if (categoryData == null || !categoryData.Any()) continue;
 
-                    foreach (var itemname in categoryData.Select(t => t.ItemName).Distinct().OrderBy(t => t))
+                    foreach (var itemname in categoryData.Select(t => t.ItemName).Distinct())
                     {
                         var itemnameData = categoryData.Where(t => t.ItemName == itemname);
                         if (itemnameData == null || !itemnameData.Any()) continue;