Merge branch 'develop' into release/v22.2.10-Beta-ninghai

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -806,7 +806,7 @@
         </member>
         <member name="M:Performance.Api.Controllers.ConfigController.BatchCheckAccounting(System.Int32)">
             <summary>
-            核算单元及组别批量添加
+            核算单元及组别检验
             </summary>
             <param name="allotId"></param>
             <returns></returns>

performance/Performance.Services/PersonService.cs

@@ -270,7 +270,7 @@ public ApiResponse CreatePerson(PerEmployeeResponse request)
             unittype.AddRange(EnumHelper.GetItems<AccountUnitType>().Select(t => t.Description));
 
             if (!unittype.Contains(request.UnitType))
-                throw new PerformanceException($"人员类别不符合规范！");
+                throw new PerformanceException($"核算组别不符合规范！");
 
             var entity = _mapper.Map<per_employee>(request);
             var allot = perallotRepository.GetEntity(t => t.ID == request.AllotId);
@@ -333,7 +333,7 @@ public ApiResponse UpdatePerson(PerEmployeeResponse request)
             unittype.AddRange(EnumHelper.GetItems<AccountUnitType>().Select(t => t.Description));
 
             if (!unittype.Contains(request.UnitType))
-                throw new PerformanceException($"人员类别不符合规范！");
+                throw new PerformanceException($"核算组别不符合规范！");
 
             var employee = employees.First();
             //_mapper.Map(request, employee, typeof(per_employee), typeof(per_employee));
@@ -741,7 +741,7 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId)
                     if (columns.Contains(column.Data))
                         column.Type = "text";
 
-                    if (column.Data == "人员类别")
+                    if (column.Data == "核算组别")
                     {
                         column.Type = "autocomplete";
                         column.Source = EnumHelper.GetItems<UnitType>().Select(w => w.Description.Replace("行政后勤", "行政工勤")).ToArray();
@@ -1075,6 +1075,7 @@ private void DeptDicList(int HospitalId, List<per_dept_dic> deptDics, DeptdicHan
 
         public static List<(string, string, Func<PersonePassword, object>)> PersonPassword { get; } = new List<(string, string, Func<PersonePassword, object>)>
         {
+            (nameof(PersonePassword.UnitType), "核算组别", t => t.UnitType),
             (nameof(PersonePassword.AccountingUnit), "核算单元", t => t.AccountingUnit),
             (nameof(PersonePassword.Department), "科室名称", t => t.Department),
             (nameof(PersonePassword.DoctorName), "姓名" ,t => t.DoctorName),
@@ -1082,7 +1083,6 @@ private void DeptDicList(int HospitalId, List<per_dept_dic> deptDics, DeptdicHan
             //(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),
@@ -1092,6 +1092,7 @@ private void DeptDicList(int HospitalId, List<per_dept_dic> deptDics, DeptdicHan
 
         public static List<(string, string, Func<per_employee, object>)> Person { get; } = new List<(string, string, Func<per_employee, object>)>
         {
+            (nameof(per_employee.UnitType), "核算组别", t => t.UnitType),
             (nameof(per_employee.AccountingUnit), "核算单元", t => t.AccountingUnit),
             (nameof(per_employee.Department), "科室名称", t => t.Department),
             (nameof(per_employee.DoctorName), "姓名" ,t => t.DoctorName),
@@ -1099,7 +1100,6 @@ private void DeptDicList(int HospitalId, List<per_dept_dic> deptDics, DeptdicHan
             //(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),