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

performance/Performance.Services/PersonService.cs

@@ -748,12 +748,12 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<per_employee>(json);
 
-                if (!string.IsNullOrEmpty(item["AttendanceDay"]) && !string.IsNullOrEmpty(item["ReservedRatio"]))
-                {
-                    decimal attendanceDay = ConvertHelper.To<decimal>(item["AttendanceDay"]), reservedRatio = ConvertHelper.To<decimal>(item["ReservedRatio"]);
-                    if ((!Regex.IsMatch(item["AttendanceDay"], "^(?:[0-2]*[0-9]?|30|31)$")) || (!Regex.IsMatch(item["ReservedRatio"], @"^(0.\d{1,2}|0|1)?$")))
-                        return false;
-                }
+                //if (!string.IsNullOrEmpty(item["AttendanceDay"]) && !string.IsNullOrEmpty(item["ReservedRatio"]))
+                //{
+                //    decimal attendanceDay = ConvertHelper.To<decimal>(item["AttendanceDay"]), reservedRatio = ConvertHelper.To<decimal>(item["ReservedRatio"]);
+                //    if ((!Regex.IsMatch(item["AttendanceDay"], "^(?:[0-2]*[0-9]?|30|31)$")) || (!Regex.IsMatch(item["ReservedRatio"], @"^(0.\d{1,2}|0|1)?$")))
+                //        return false;
+                //}
 
                 var any = employees.Any(w => w.Department?.Trim() == data.Department?.Trim() && w.DoctorName?.Trim() == data.DoctorName?.Trim());
 
@@ -944,15 +944,15 @@ private void DeptDicList(int HospitalId, List<per_dept_dic> deptDics, DeptdicHan
             (nameof(PersonePassword.Department), "科室名称", t => t.Department),
             (nameof(PersonePassword.DoctorName), "姓名" ,t => t.DoctorName),
             (nameof(PersonePassword.PersonnelNumber), "员工工号", t => t.PersonnelNumber),
-            (nameof(PersonePassword.JobCategory), "正式/临聘", t => t.JobCategory),
-            (nameof(PersonePassword.Duty), "职务", t => t.Duty),
-            (nameof(PersonePassword.JobTitle), "职称", t => t.JobTitle),
+            //(nameof(PersonePassword.JobCategory), "正式/临聘", t => t.JobCategory),
+            //(nameof(PersonePassword.Duty), "职务", t => t.Duty),
+            //(nameof(PersonePassword.JobTitle), "职称", t => t.JobTitle),
             (nameof(PersonePassword.UnitType), "人员类别", t => t.UnitType),
-            (nameof(PersonePassword.AttendanceDay), "出勤天数", t => t.AttendanceDay),
-            (nameof(PersonePassword.ReservedRatio), "预留比例", t => t.ReservedRatio),
-            (nameof(PersonePassword.BankCard), "银行卡号", t => t.BankCard),
-            (nameof(PersonePassword.Password), "密码", t => t.Password),
-            (nameof(PersonePassword.Remark), "备注", t => t.Remark),
+            //(nameof(PersonePassword.AttendanceDay), "出勤天数", t => t.AttendanceDay),
+            //(nameof(PersonePassword.ReservedRatio), "预留比例", t => t.ReservedRatio),
+            //(nameof(PersonePassword.BankCard), "银行卡号", t => t.BankCard),
+            //(nameof(PersonePassword.Password), "密码", t => t.Password),
+            //(nameof(PersonePassword.Remark), "备注", t => t.Remark),
         };
 
         public static List<(string, string, Func<per_employee, object>)> Person { get; } = new List<(string, string, Func<per_employee, object>)>
@@ -961,14 +961,14 @@ private void DeptDicList(int HospitalId, List<per_dept_dic> deptDics, DeptdicHan
             (nameof(per_employee.Department), "科室名称", t => t.Department),
             (nameof(per_employee.DoctorName), "姓名" ,t => t.DoctorName),
             (nameof(per_employee.PersonnelNumber), "员工工号", t => t.PersonnelNumber),
-            (nameof(per_employee.JobCategory), "正式/临聘", t => t.JobCategory),
-            (nameof(per_employee.Duty), "职务", t => t.Duty),
-            (nameof(per_employee.JobTitle), "职称", t => t.JobTitle),
+            //(nameof(per_employee.JobCategory), "正式/临聘", t => t.JobCategory),
+            //(nameof(per_employee.Duty), "职务", t => t.Duty),
+            //(nameof(per_employee.JobTitle), "职称", t => t.JobTitle),
             (nameof(per_employee.UnitType), "人员类别", t => t.UnitType),
-            (nameof(per_employee.AttendanceDay), "出勤天数", t => t.AttendanceDay),
-            (nameof(per_employee.ReservedRatio), "预留比例", t => t.ReservedRatio),
-            (nameof(per_employee.BankCard), "银行卡号", t => t.BankCard),
-            (nameof(per_employee.Remark), "备注", t => t.Remark),
+            //(nameof(per_employee.AttendanceDay), "出勤天数", t => t.AttendanceDay),
+            //(nameof(per_employee.ReservedRatio), "预留比例", t => t.ReservedRatio),
+            //(nameof(per_employee.BankCard), "银行卡号", t => t.BankCard),
+            //(nameof(per_employee.Remark), "备注", t => t.Remark),
         };
 
         private static Dictionary<string, string> DeptDic { get; } = new Dictionary<string, string>

performance/Performance.Services/ReportGlobalService.cs

@@ -546,7 +546,25 @@ public HandsonTable GetReportPersonTag(int hospitalId)
                 rowDatas.Add(new HandsonRowData(i, cells));
                 i++;
             }
-            result.SetRowData(rowDatas, rowDatas != null);
+
+            List<HandsonRowData> rowDatas2 = new List<HandsonRowData>();
+            foreach (var item in rowDatas)
+            {
+                if (rowDatas2.Count == 0)
+                    rowDatas2.Add(item);
+                var flag = true;
+
+                foreach (var item2 in rowDatas2)
+                {
+                    if (item.CellData.ToList()[1].Value.Equals(item2.CellData.ToList()[1].Value))
+                        flag = false;
+                }
+
+                if (flag)
+                    rowDatas2.Add(item);
+            }
+
+            result.SetRowData(rowDatas2, rowDatas2 != null);
             return result;
         }
 
@@ -559,7 +577,7 @@ public void SaveReportPersonTag(int hospitalId, SaveCollectData request)
             {
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<report_performance_person_tags>(json);
-                if (!string.IsNullOrEmpty(data.UnitType) && !string.IsNullOrEmpty(data.AccountingUnit) && !string.IsNullOrEmpty(data.PersonnelName) && !string.IsNullOrEmpty(data.PersonnelNumber) && !string.IsNullOrEmpty(data.Tag1) && !string.IsNullOrEmpty(data.Tag2))
+                if (/*!string.IsNullOrEmpty(data.UnitType) && !string.IsNullOrEmpty(data.AccountingUnit) && */!string.IsNullOrEmpty(data.PersonnelName) && !string.IsNullOrEmpty(data.PersonnelNumber) && !string.IsNullOrEmpty(data.Tag1) && !string.IsNullOrEmpty(data.Tag2))
                 {
                     data.CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     personTags.Add(data);
@@ -619,8 +637,8 @@ 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.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), "绩效发放情况"},