Merge branch 'develop' of http://192.168.18.110:8880/zry/performance into develop

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

@@ -450,6 +450,11 @@
             科室
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_bodysource.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ag_bodysource.Post">
             <summary>
             岗位

performance/Performance.EntityModels/Entity/ag_bodysource.cs

@@ -47,6 +47,11 @@ public class ag_bodysource
         public string Department { get; set; }
 
         /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+
+        /// <summary>
         /// 岗位
         /// </summary>
         public string Post { get; set; }

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -416,7 +416,6 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
                 //dept.MedicineExtra = 0;// (drugExtra ?? 0);
                 //dept.MaterialsExtra = 0;//(materialsExtra ?? 0);
 
-
                 dept.PerforFee = empolyees.Sum(w => w.PerforTotal ?? 0);
                 dept.PerforTotal = Math.Round(empolyees.Sum(w => w.GiveFee ?? 0), MidpointRounding.AwayFromZero);
                 dept.AssessLaterPerforTotal = Math.Round((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra) ?? 0, MidpointRounding.AwayFromZero);

performance/Performance.Services/ComputeService.cs

@@ -590,15 +590,15 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
                 UnitName = t.Key.AccountType == "行政后勤" ? "行政工勤" : t.Key.AccountType,
                 AccountingUnit = t.Key.AccountingUnit,
                 Department = t.Key.AccountingUnit,
-                PerforFee = 0,
+                PerforFee = t.Sum(w => w.PerforTotal),
                 WorkloadFee = 0,
                 AssessBeforeOtherFee = 0,
                 PerforTotal = t.Sum(w => w.PerforTotal),
                 ScoringAverage = 1,
-                Extra = 0,
+                Extra = t.Sum(w => w.Punishment),
                 MedicineExtra = 0,
                 MaterialsExtra = 0,
-                AssessLaterOtherFee = 0,
+                AssessLaterOtherFee = t.Sum(w => w.AssessLaterOtherFee),
                 AssessLaterPerforTotal = t.Sum(w => Math.Round(w.GiveFee ?? 0, MidpointRounding.AwayFromZero)),
                 AdjustFactor = t.FirstOrDefault()?.Adjust ?? 1,
                 AdjustLaterOtherFee = t.Sum(w => w.AdjustLaterOtherFee),

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadPersonExtra.cs

@@ -19,7 +19,7 @@ public class PerSheetDataReadPersonExtra : IPerSheetDataRead
             HeaderLastRowNum = 1,
             HeaderFirstCellNum = 0,
             DataFirstRowNum = 2,
-            DataFirstCellNum = 3,
+            DataFirstCellNum = 5,
             TotalCellNum = 0,
             AccountingUnit = new List<AccountingUnit>
             {

performance/Performance.Services/RedistributionService.cs

@@ -176,7 +176,8 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
             {
                 new SecondColumnDictionary("人员工号",nameof(ag_bodysource.WorkNumber),true,100),
                 new SecondColumnDictionary("姓名",nameof(ag_bodysource.Name),true,100),
-                new SecondColumnDictionary("科室",nameof(ag_bodysource.Department),true,100),
+                new SecondColumnDictionary("分配科室",nameof(ag_bodysource.Department),true,100),
+                new SecondColumnDictionary("核算单元",nameof(ag_bodysource.AccountingUnit),true,100),
 
                 new SecondColumnDictionary("职称绩效", nameof(ag_bodysource.TitlePerformance), true, 299),
 
@@ -495,7 +496,8 @@ List<ag_bodysource> LoadEmployeeByDictionary(ag_secondallot second, List<per_emp
                 var data = new ag_bodysource
                 {
                     SecondId = second.Id,
-                    Department = existEmp?.AccountingUnit ?? "",
+                    Department = second.Department ?? "",
+                    AccountingUnit = existEmp?.AccountingUnit ?? "",
                     WorkNumber = personnelNumber,
                     Name = existEmp?.DoctorName ?? "花名册无信息",
                     JobTitle = existEmp?.JobTitle ?? "",
@@ -792,7 +794,8 @@ public void SupplementOtherPerfor(ag_secondallot second, List<Dictionary<string,
                         { nameof(ag_bodysource.SecondId), second.Id },
                         { nameof(ag_bodysource.WorkNumber), item.Key.PersonnelNumber },
                         { nameof(ag_bodysource.Name), item.Key.DoctorName },
-                        { nameof(ag_bodysource.Department), item.Key.AccountingUnit },
+                        { nameof(ag_bodysource.Department), second.Department },
+                        { nameof(ag_bodysource.AccountingUnit),  item.Key.AccountingUnit},
                         { nameof(ag_bodysource.OtherPerformance), item.Sum(w => w.Amount )},
                     });
                 }
@@ -1298,7 +1301,12 @@ public List<SecondComputeCheckResultDto> CheckData(ag_secondallot second, Comput
                 ?.Select(w => new { w.PersonnelNumber, w.DoctorName, w.AccountingUnit, w.UnitType, w.ReservedRatio });
 
             var handsonTable = GetHandsonTable(computeMode, loads);
-            var fixat = new string[] { nameof(ag_bodysource.Id).ToLower(), nameof(ag_bodysource.SecondId).ToLower(), nameof(ag_bodysource.Department).ToLower() };
+            var fixat = new string[] {
+                nameof(ag_bodysource.Id).ToLower(),
+                nameof(ag_bodysource.SecondId).ToLower(),
+                nameof(ag_bodysource.Department).ToLower(),
+                nameof(ag_bodysource.AccountingUnit).ToLower()
+            };
             for (int i = 0; i < body.Count; i++)
             {
                 var item = body[i];
@@ -1321,7 +1329,8 @@ public List<SecondComputeCheckResultDto> CheckData(ag_secondallot second, Comput
                     {
                         var emp = employees?.FirstOrDefault(w => w.PersonnelNumber == number && w.DoctorName == name);
                         item.AddOrUpdate(nameof(ResponseType), ResponseType.OK);
-                        item.AddOrUpdate(nameof(ag_bodysource.Department), emp?.AccountingUnit ?? "");
+                        item.AddOrUpdate(nameof(ag_bodysource.Department), second.Department ?? "");
+                        item.AddOrUpdate(nameof(ag_bodysource.AccountingUnit), emp?.AccountingUnit ?? "");
                         item.AddOrUpdate(nameof(ag_bodysource.ReservedRatio), emp?.ReservedRatio ?? 0);
                     }
                 }
@@ -1416,7 +1425,8 @@ public object RedistributionEmployee(SecondEmployeeDto request)
 
                     item.Add(nameof(per_employee.UnitType), employee.UnitType);
                     item.Add(nameof(ag_bodysource.SecondId), request.SecondId);
-                    item.Add(nameof(ag_bodysource.Department), employee.AccountingUnit);
+                    item.Add(nameof(ag_bodysource.Department), second.Department);
+                    item.Add(nameof(ag_bodysource.AccountingUnit), employee.AccountingUnit);
                     item.Add(nameof(ag_bodysource.Name), employee.DoctorName);
                     item.Add(nameof(ag_bodysource.WorkNumber), employee.PersonnelNumber);
                     item.Add(nameof(ag_bodysource.JobTitle), employee.JobTitle);

performance/Performance.Services/SecondAllotService.cs

@@ -1826,7 +1826,8 @@ public bool NursingDeptAudit(int userId, SecondAuditRequest request)
             }
             else
             {
-                second.UseTempId = null;
+                // 护理部审核 不修改 模板信息 20210926 zry
+                //second.UseTempId = null;
                 second.NursingDeptStatus = 4;
                 second.NursingDeptRemark = $"{request.Remark}";
             }