优化所有区的统计接口

TEAMModelBI/Controllers/Census/SchoolController.cs

@@ -1048,15 +1048,14 @@ namespace TEAMModelBI.Controllers.Census
             {
                 statsInfos.Add(item);
             }
-            var areaGroup = statsInfos.GroupBy(g => g.areaId).ToList().Select(s => s.Where(w => w.areaId.Equals(s.Key)));
-            
+            var areaGroup = statsInfos.GroupBy(p => p.areaId).Select(s => new { areaId = s.Key, lessAct = (s.Select(sl => sl.lesson.all).Sum() + s.Select(sa => sa.activity.all).Sum()), lessCnt = s.Select(sl => sl.lesson.all).Sum(), actCnt = s.Select(sa => sa.activity.all).Sum() }).ToList();            
 
             StatsInfo statsInfo = null;
             statsInfo = SchoolStatsWay.GetAreaStats(cosmosClient, _httpTrigger, _option, statsInfos);
             if (statsInfo != null)
             {
                 allScStats.areaCnt = areaCnt;
-                allScStats.sc = scCnt;
+                allScStats.sc = statsInfos.Count;
                 allScStats.weekSc = scWeekCnt;
                 allScStats.monthSc = scMonthCnt;
                 allScStats.tch = statsInfo.tch;
@@ -1113,7 +1112,7 @@ namespace TEAMModelBI.Controllers.Census
                 }
             }
 
-            return Ok(new { state = RespondCode.Ok, allScStats, areaGrup });
+            return Ok(new { state = RespondCode.Ok, allScStats, areaGroup });
         }
 
         #endregion   新的统计接口
@@ -1232,7 +1231,7 @@ namespace TEAMModelBI.Controllers.Census
             public string id { get; set; }
             public string name { get; set; }
             public int weekSc { get; set; }
-            public int monthSc{ get; set; }
+            public int monthSc { get; set; }
             public int tch { get; set; }
             public int dayTch { get; set; }
             public int weekTch { get; set; }
@@ -1283,6 +1282,10 @@ namespace TEAMModelBI.Controllers.Census
         /// </summary>
         public record AllScStats
         {
+            public int areaCnt { get; set; }
+            public int sc { get; set; }
+            public int weekSc { get; set; }
+            public int monthSc { get; set; }
             public int tch { get; set; }
             public int dayTch { get; set; }
             public int weekTch { get; set; }