修改名称

performance/Performance.ConsoleApp/Program.cs

@@ -69,8 +69,8 @@ static void Main(string[] args)
             var task = emailService.SendAsync(message);
             task.Wait();
 
-            Mapper.Initialize(cfg => cfg.AddProfile<AutoMapperConfigs>());
-            services.AddAutoMapper();
+            //Mapper.Initialize(cfg => cfg.AddProfile<AutoMapperConfigs>());
+            //services.AddAutoMapper();
 
             //service注入 repoitory注入 
             services
@@ -79,10 +79,10 @@ static void Main(string[] args)
 
             var connection = configuration.GetSection("AppConnection:PerformanceConnectionString").Value;
 
-            services.AddDbContext<PerformanceDbContext>(options =>
-            {
-                options.UseMySQL(connection);
-            });
+            //services.AddDbContext<PerformanceDbContext>(options =>
+            //{
+            //    options.UseMySQL(connection);
+            //});
 
             Console.ReadKey();
         }

performance/Performance.Services/ComputeService.cs

@@ -2083,9 +2083,9 @@ public QueryComputeByDateGetPage GetAllComputeViewByDate(string viewName, BeginE
   and str_to_date(concat(year, '-', month, '-01'), '%Y-%m-%d') < '{request.EndTime}-01'
   and hospitalid = {request.HospitalId}";
 
-            if (request.Search != null && request.Search.Any())
+            if (request.Search != null && request.Search.Any(w => !string.IsNullOrEmpty(w.Title) && !string.IsNullOrEmpty(w.Value)))
             {
-                var where = request.Search.Select(t => $"{t.Title} like '%{t.Value}%'");
+                var where = request.Search.Where(w => !string.IsNullOrEmpty(w.Title) && !string.IsNullOrEmpty(w.Value)).Select(t => $"{t.Title} like '%{t.Value}%'");
                 sql += " and " + string.Join(" and ", where);
             }
 
@@ -2157,7 +2157,7 @@ public class ComputeConfig
         public static List<cof_alias> AllComputeView { get; } = new List<cof_alias>
         {
             new cof_alias{ Alias = "来源", Name = nameof(view_allot_sign_emp.Source), States = 1},
-            new cof_alias{ Alias = "科室类别", Name = nameof(view_allot_sign_emp.UnitType), States = 1},
+            new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1},
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1},
 
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1},
@@ -2198,7 +2198,7 @@ public static List<cof_alias> AllComputeViewByDate
 
         public static List<cof_alias> AllComputePersonView { get; } = new List<cof_alias>
         {
-            new cof_alias{ Alias = "科室类别", Name = nameof(view_allot_sign_emp.UnitType), States = 1},
+            new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_emp.UnitType), States = 1},
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_emp.AccountingUnit), States = 1},
             new cof_alias{ Alias = "员工号", Name = nameof(view_allot_sign_emp.JobNumber), States = 1},
             new cof_alias{ Alias = "人员姓名", Name = nameof(view_allot_sign_emp.EmployeeName), States = 1},
@@ -2229,7 +2229,7 @@ public static List<cof_alias> AllComputePersonViewByDate
         }
         public static List<cof_alias> AllComputeDepartmentView { get; } = new List<cof_alias>
         {
-            new cof_alias{ Alias = "核算群体", Name = nameof(view_allot_sign_dept.UnitName), States = 1},
+            new cof_alias{ Alias = "核算组别", Name = nameof(view_allot_sign_dept.UnitName), States = 1},
             new cof_alias{ Alias = "核算单元", Name = nameof(view_allot_sign_dept.AccountingUnit), States = 1},
             new cof_alias{ Alias = "业绩绩效", Name = nameof(view_allot_sign_dept.PerforFee), States = 1},
             new cof_alias{ Alias = "工作量绩效", Name = nameof(view_allot_sign_dept.WorkloadFee), States = 1},