人员标签显示

performance/Performance.Services/ComputeConfig.cs

-using Performance.DtoModels;
+using Performance.DtoModels;
 using Performance.EntityModels;
 using System;
 using System.Collections.Generic;
@@ -170,10 +170,11 @@ public static List<cof_alias> GetAllPersonnelTags(bool ownerQuery)
         {
             var alias = new List<cof_alias>
             {
-                new cof_alias{ Alias = "员工工号", Name = nameof(per_employee.PersonnelNumber), States = 1, SumStatus = 0, Sort = 2 },
-                new cof_alias{ Alias = "HIS工号", Name = nameof(per_employee.JobNumber), States = 1, SumStatus = 0, Sort = 3 },
-                new cof_alias{ Alias = "姓名", Name = nameof(per_employee.DoctorName), States = 1, SumStatus = 0, Sort = 4 },
-                new cof_alias{ Alias = "核算单元", Name = nameof(per_employee.AccountingUnit), States = 1, SumStatus = 0, Sort = 6 },
+                new cof_alias{ Alias = "员工工号", Name = nameof(per_employee.PersonnelNumber), States = 1, SumStatus = 0, Sort = 0 },
+                new cof_alias{ Alias = "姓名", Name = nameof(per_employee.DoctorName), States = 1, SumStatus = 0, Sort = 0 },
+                new cof_alias{ Alias = "核算单元", Name = nameof(per_employee.AccountingUnit), States = 1, SumStatus = 0, Sort = 0 },
+                new cof_alias{ Alias = "核算组别", Name = nameof(per_employee.UnitType), States = 0, SumStatus = 0, Sort = 6 },
+                new cof_alias{ Alias = "HIS工号", Name = nameof(per_employee.JobNumber), States = 1, SumStatus = 0, Sort = 7 },
 
 
                 new cof_alias{ Alias = "正式/临聘", Name = nameof(per_employee.JobCategory), States = 1, SumStatus = 0, Sort = 8 },
@@ -194,7 +195,6 @@ public static List<cof_alias> GetAllPersonnelTags(bool ownerQuery)
                 new cof_alias{ Alias = "备用09", Name = nameof(per_employee.Reserve09), States = 0, SumStatus = 0, Sort = 20 },
                 new cof_alias{ Alias = "备用10", Name = nameof(per_employee.Reserve10), States = 0, SumStatus = 0, Sort = 20 },
 
-                new cof_alias{ Alias = "核算组别", Name = nameof(report_performance_person_tags.UnitType), States = 1, SumStatus = 0, Sort = 99 },
                 new cof_alias{ Alias = "绩效发放情况", Name = nameof(report_performance_person_tags.Tag1), States = 1, SumStatus = 0, Sort = 100 },
                 new cof_alias{ Alias = "当月绩效权重", Name = nameof(report_performance_person_tags.Tag2), States = 1, SumStatus = 0, Sort = 101 },
                 new cof_alias{ Alias = "重点群体对比1", Name = nameof(report_performance_person_tags.Tag3), States = 1, SumStatus = 0, Sort = 102 },

performance/Performance.Services/ReportGlobalService.cs

@@ -566,6 +566,7 @@ select new
                             PersonnelNumber = t1.PersonnelNumber,
                             DoctorName = t1.DoctorName,
                             AccountingUnit = t1.AccountingUnit,
+                            UnitType = t1.UnitType,
                             JobCategory = t1.JobCategory,
                             Duty = t1.Duty,
                             JobTitle = t1.JobTitle,