保存列名

performance/Performance.Services/ComputeService.cs

@@ -2019,51 +2019,47 @@ public bool UpdateHeadersStatus(ComputerAliasUpdate request)
             // 数据库中无数据
             if (hasreq && !hasdata)
             {
-
-                var items = heads.Where(w => request.computerAliasHead.Select(t => t.Head).Contains(w.Alias));
-
-                var data = items.Select(t => new cof_alias
+                var items = request.computerAliasHead.Select(t => t.Head.ToLower());
+                var data = heads.Select(t => new cof_alias
                 {
                     Route = request.Route,
                     Alias = t.Alias,
                     OriginalName = t.Alias,
                     HospitalId = request.HospitalId,
                     Name = t.Name,
-                        States = 1,
+                    States = items.Contains(t.Alias ?? "") ? 1 : 0,
                     SumStatus = t.SumStatus
                 });
-
-               
                 cofaliasRepository.AddRange(data.ToArray());
             }
 
             // 未提交数据
             else if (!hasreq && hasdata)
             {
-                list.ForEach(t => t.States = 1);
+                list.ForEach(t => t.States = 0);
                 cofaliasRepository.UpdateRange(list.ToArray());
             }
 
             // 修改 && 新增
             else if (hasreq && hasdata)
             {
-                list.ForEach(t =>
+                var headIds = request.computerAliasHead.Select(t => t.HeadId);
+                if (list.Any(w => headIds.Contains(w.Id)))
                 {
-                    t.States = 0;
-                });
-                cofaliasRepository.UpdateRange(list.ToArray());
-                if (list.Any(w => request.computerAliasHead.Select(t => t.HeadId).Contains(w.Id)))
+                    list.ForEach(t =>
                     {
-                    var updata = list.Where(w => request.computerAliasHead.Select(t => t.HeadId).Contains(w.Id)).ToList();
-                    updata.ForEach(t =>
+                        if (headIds.Contains(t.Id))
                         {
                             t.States = 1;
                             t.Alias = request.computerAliasHead.FirstOrDefault(w => w.HeadId == t.Id).Head;
+                        }
+                        else
+                            t.States = 0;
                     });
                     cofaliasRepository.UpdateRange(list.ToArray());
                 }
 
-                if (request.computerAliasHead.Any(w => w.HeadId == 0))
+                if (headIds.Any(w => w == 0))
                 {
                     var table = cofaliasRepository.GetEntities(w => w.Route == request.Route);
                     var items = heads.Where(w => request.computerAliasHead.Where(w => w.HeadId == 0).Select(t => t.Head).Contains(w.Alias));
@@ -2093,11 +2089,6 @@ public bool UpdateHeadersStatus(ComputerAliasUpdate request)
         /// <returns></returns>
         public List<cof_alias> CustomColumnHeaders(int hospitalId, string route, params string[] heads)
         {
-            var init = new List<cof_alias>();
-            var alias = cofaliasRepository.GetEntities(t => t.HospitalId == hospitalId) ?? new List<cof_alias>();
-            alias = alias.Where(t => t.Route.Equals(route, StringComparison.OrdinalIgnoreCase)).OrderBy(w => w.Id).ToList() ?? new List<cof_alias>();
-
-
             var pairs = new Dictionary<string, List<cof_alias>>
                 {
                     { "/result/compute" , ComputeConfig.AllComputeView },
@@ -2113,47 +2104,13 @@ public List<cof_alias> CustomColumnHeaders(int hospitalId, string route, params
                     { "/report/wholehospital_finance_grant_summary" , ComputeConfig.PerformanceTotal(route,heads) },
 
                 };
-            init = pairs.ContainsKey(route.ToLower()) ? pairs[route.ToLower()] : new List<cof_alias>();
-
-            foreach (var item in alias)
-            {
-                var x = init.FirstOrDefault(w => w.Name.Equals(item.Name, StringComparison.OrdinalIgnoreCase));
-                if (x == null)
-                {
-                    init.Add(item);
-                }
-                else
-                {
-                    x.Id = item.Id;
-                    x.HospitalId = hospitalId;
-                    x.Route = route;
-                    x.Alias = item.Alias;
-                    x.States = item.States;
-                }
-            };
+            var init = pairs.ContainsKey(route.ToLower()) ? pairs[route.ToLower()] : new List<cof_alias>();
 
-            /*if (alias == null || alias.Count == 0)
-            {
-                var pairs = new Dictionary<string, List<cof_alias>>
-                {
-                    { "/result/compute" , ComputeConfig.AllComputeView },
-                    { "/result/wholehospital" , ComputeConfig.AllComputePersonView },
-                    { "/result/print/compute" , ComputeConfig.AllComputeDepartmentView },
+            var alias = cofaliasRepository.GetEntities(t => t.HospitalId == hospitalId && t.Route.Equals(route, StringComparison.OrdinalIgnoreCase))?.OrderBy(w => w.Id).ToList()
+                ?? new List<cof_alias>();
 
-                    { "/report/wholehospital_grant" , ComputeConfig.AllComputeViewByDate },
-                    { "/report/wholehospital_accounting_grant" , ComputeConfig.AllComputeDepartmentViewByDate },
-                    { "/report/wholehospital_finance_grant" , ComputeConfig.AllComputePersonViewByDate },
+            if (alias == null || !alias.Any()) return init;
 
-                    { "/report/wholehospital_grant_summary" , ComputeConfig.PerformanceTotal(route,heads) },
-                    { "/report/wholehospital_accounting_grant_summary" , ComputeConfig.PerformanceTotal(route,heads) },
-                    { "/report/wholehospital_finance_grant_summary" , ComputeConfig.PerformanceTotal(route,heads) },
-
-                };
-                init = pairs.ContainsKey(route.ToLower()) ? pairs[route.ToLower()] : new List<cof_alias>();
-            }
-
-            if (alias != null && alias.Count > 0)
-            {
             foreach (var item in alias)
             {
                 var x = init.FirstOrDefault(w => w.Name.Equals(item.Name, StringComparison.OrdinalIgnoreCase));
@@ -2163,14 +2120,13 @@ public List<cof_alias> CustomColumnHeaders(int hospitalId, string route, params
                 }
                 else
                 {
+                    x.Id = item.Id;
                     x.HospitalId = hospitalId;
                     x.Route = route;
                     x.Alias = item.Alias;
                     x.States = item.States;
                 }
-                }
-            }*/
-
+            };
 
             return init;
         }