汇总表添加是否求和状态

performance/Performance.Api/Controllers/ComputeController.cs

@@ -386,7 +386,11 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest
         [HttpPost]
         public ApiResponse CustomColumnHeaders([FromBody] ComputerAliasRequest request)
         {
-            var result = _computeService.CustomColumnHeaders(request.HospitalId, request.Route);
+            for (int i = 0; i < request.Heads.Length; i++)
+            {
+                request.Heads[i] = request.Heads[i].ToLower();
+            }
+            var result = _computeService.CustomColumnHeaders(request.HospitalId, request.Route,request.Heads);
             return new ApiResponse(ResponseType.OK, result);
         }
 

performance/Performance.DtoModels/Request/ComputerRequest.cs

@@ -49,6 +49,7 @@ public ComputerRequestValidator()
 
     public class ComputerAliasRequest
     {
+        public string[] Heads { get; set; }
         public int HospitalId { get; set; }
 
         public string Route { get; set; }
@@ -75,6 +76,7 @@ public class HospitalGrantSummary : BeginEndTime
     }
     public class HospitalGrantSummaryDown : HospitalGrantSummary
     {
+        
         public int HospitalId { get; set; }
         public string[] heads { get; set; }
     }
@@ -94,7 +96,6 @@ public class GetPage
     }
     public class QueryComputeByDateGetTotal: GetPage
     {
-        public List<cof_alias> Head { get; set; }
         public List<dynamic> Data { get; set; }
         public decimal TotalData { get; set; }}
     }

performance/Performance.Services/ComputeService.cs

@@ -2092,17 +2092,6 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req
                 string.IsNullOrEmpty(request.EndTime) || !DateTime.TryParse(request.EndTime, out edate))
                 throw new PerformanceException("请输入正确的时间");
 
-
-
-            var headlist = request.GroupBy.Union(request.SumBy).Select(t => t.ToLower()).ToList();
-
-            List<cof_alias> AllComputeView = ComputeConfig.AllComputeView.ToList();
-
-            if ((request.GroupBy != null && request.GroupBy.Any(t => !string.IsNullOrEmpty(t))) &&
-                (request.SumBy != null && request.SumBy.Any(t => !string.IsNullOrEmpty(t))))
-                AllComputeView = ComputeConfig.AllComputeView.Where(t => headlist.Contains(t.Name.ToLower())).ToList();
-
-
             decimal TotalData = 0;
 
             var(TotalCount, datas) = GetAllComputeViewByDateAndTotal(ViewName, bdate, edate.AddMonths(1), request.GroupBy, request.SumBy);
@@ -2117,7 +2106,6 @@ public QueryComputeByDateGetTotal GetPerformanceSummary(HospitalGrantSummary req
 
             var list = new QueryComputeByDateGetTotal
             {
-                Head = AllComputeView,
                 Data = datas,
                 TotalData = TotalData,
                 TotalCount = TotalCount,
@@ -2171,7 +2159,7 @@ public class ComputeConfig
     {
         public static List<cof_alias> PerformanceTotal(string route,string[] heads)
         {
-            if (heads == null)
+            if (heads.Length == 0 || string.IsNullOrEmpty(heads[0]) || heads[0] == null)
             {
                 if (route == "/report/wholehospital_grant_summary")
                     return AllComputeView.ToList();