每月汇报表返回结果排序，不输入条件查询所有

performance/Performance.Services/StatisticsService.cs

@@ -48,11 +48,14 @@ PerforReportStatisticsTreeRepository ReportStatisticsTreeRepository
             List<string> plist = new List<string>();
             foreach (var item in pairs)
             {
-                if (!Regex.IsMatch(sql, $"@{item.Key}", RegexOptions.IgnoreCase | RegexOptions.Multiline))
+                var json = JsonHelper.Serialize(item.Value);
+                if (!Regex.IsMatch(sql, $"@{item.Key}", RegexOptions.IgnoreCase | RegexOptions.Multiline) && !string.IsNullOrEmpty(json) && json != "[]")
                 {
                     var key = item.Key.StartsWith("@") ? item.Key.Substring(1, item.Key.Length - 1) : item.Key;
                     if (item.Value.GetType().GetInterfaces().Any(iface => iface.IsGenericType && iface.GetGenericTypeDefinition() == typeof(ICollection<>)))
+                    {
                         plist.Add($"{key} IN @{key}");
+                    }
                     else
                         plist.Add($"{key} = @{key}");
                 }
@@ -117,12 +120,13 @@ public StatisticsInfoDto GetInfo(int hospitalID, int statisticsId)
                 };
                 result.Selections.Add(statisticsSelectionDto);
             }
+            result.Selections = result.Selections.OrderBy(t => t.Sort).ToList();
             return result;
         }
 
         public List<report_statistics_selection_record> GetSelectionRecord(int hospitalID, int statisticsId)
         {
-            var result = _reportStatisticsSelectionRecordRepository.GetEntities(t => t.HospitalId == hospitalID && t.StatisticsID == statisticsId).OrderByDescending(t => t.UpdateDate).ToList();
+            var result = _reportStatisticsSelectionRecordRepository.GetEntities(t => t.HospitalId == hospitalID && t.StatisticsID == statisticsId).OrderByDescending(t => t.UpdateDate).OrderByDescending(t=>t.CreateDate).ToList();
             return result;
         }