Merge branch 'feature/人员字典修改' into feature/自动执行“加载上月”

performance/Performance.Services/ReportGlobalService.cs

@@ -534,19 +534,25 @@ public HandsonTable GetReportPersonTag(int hospitalId, int allotId)
                 Visible = 1
             }).ToList());
 
-            var pdata = perforPeremployeeRepository.GetEntities(t => t.HospitalId == hospitalId && t.AllotId == allotId).Select(t=>new { t.UnitType,t.AccountingUnit,t.PersonnelNumber,t.DoctorName });
+            var pdata = perforPeremployeeRepository.GetEntities(t => t.HospitalId == hospitalId && t.AllotId == allotId).Select(t=>new { t.PersonnelNumber,t.DoctorName,t.JobCategory,t.Duty,t.JobTitle,t.AttendanceDay,t.ReservedRatio,t.BankCard,t.Remark
+            });
             var tdata = reportperformancepersontagsRepository.GetEntities(t => t.HospitalId == hospitalId)?.OrderBy(t => ConvertHelper.To<long>(t.PersonnelNumber));
 
             var data = (from t1 in pdata
                         join t2 in tdata
                         on t1.PersonnelNumber equals t2.PersonnelNumber into temp
                         from t in temp.DefaultIfEmpty()
-                        select new report_performance_person_tags
+                        select new 
                         {
-                            UnitType = t1.UnitType,
-                            AccountingUnit = t1.AccountingUnit,
                             PersonnelNumber = t1.PersonnelNumber,
-                            PersonnelName = t1.DoctorName,
+                            DoctorName = t1.DoctorName,
+                            JobCategory = t1.JobCategory,
+                            Duty = t1.Duty,
+                            JobTitle = t1.JobTitle,
+                            AttendanceDay = t1.AttendanceDay,
+                            ReservedRatio = t1.ReservedRatio,
+                            BankCard = t1.BankCard,
+                            Remark = t1.Remark,
                             Tag1 = t?.Tag1,
                             Tag2 = t?.Tag2,
                             Tag3 = t?.Tag3,
@@ -570,9 +576,6 @@ public HandsonTable GetReportPersonTag(int hospitalId, int allotId)
                 i++;
             }
 
-
-
-
             //List<HandsonRowData> rowDatas2 = new List<HandsonRowData>();
             //foreach (var item in rowDatas)
             //{
@@ -663,11 +666,19 @@ public void SaveReportTag(int hospitalId, SaveCollectData request)
 
         private static Dictionary<string, string> PersonTag { get; } = new Dictionary<string, string>
         {
-            {nameof(report_performance_person_tags.UnitType), "核算单元类型"},
-            {nameof(report_performance_person_tags.AccountingUnit), "科室"},
-            {nameof(report_performance_person_tags.PersonnelNumber), "工号"},
-            {nameof(report_performance_person_tags.PersonnelName), "姓名"},
-            {nameof(report_performance_person_tags.Tag1), "绩效发放情况"},
+            //{nameof(report_performance_person_tags.UnitType), "核算单元类型"},
+            //{nameof(report_performance_person_tags.AccountingUnit), "科室"},
+
+            {nameof(per_employee.PersonnelNumber), "工号"},
+            {nameof(per_employee.DoctorName), "姓名"},
+            {nameof(per_employee.JobCategory), "正式/临聘" },
+            {nameof(per_employee.Duty), "职务" },
+            {nameof(per_employee.JobTitle), "职称" },
+            {nameof(per_employee.AttendanceDay), "出勤天数" },
+            {nameof(per_employee.ReservedRatio), "预留比例" },
+            {nameof(per_employee.BankCard), "银行卡号" },
+            {nameof(per_employee.Remark), "备注" },
+            { nameof(report_performance_person_tags.Tag1), "绩效发放情况"},
             {nameof(report_performance_person_tags.Tag2), "当月绩效权重"},
             {nameof(report_performance_person_tags.Tag3), "重点群体对比1"},
             {nameof(report_performance_person_tags.Tag4), "重点群体对比2"},