Merge branch 'feature/二次分配列头别名' into develop

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -634,7 +634,7 @@ public ApiResponse RedistributionCheck([FromBody] SecondComputeDto request)
                 List<SecondComputeCheckResultDto> result = new List<SecondComputeCheckResultDto>();
 
                 // 二次分配人员信息 校验
-                var checkData = _redistributionService.CheckData(second, (ComputeMode)request.ComputeMode, request.Body, loads);
+                var checkData = _redistributionService.CheckData(allot, second, (ComputeMode)request.ComputeMode, request.Body, loads);
                 if (checkData != null && checkData.Count > 0)
                     result.AddRange(checkData);
 
@@ -701,7 +701,7 @@ public ApiResponse RedistributionCompute([FromBody] SecondComputeDto request)
                 }
 
                 // 二次分配人员信息 校验
-                var checkDatas = _redistributionService.CheckData(second, (ComputeMode)request.ComputeMode, request.Body, loads);
+                var checkDatas = _redistributionService.CheckData(allot, second, (ComputeMode)request.ComputeMode, request.Body, loads);
                 if (checkDatas != null && checkDatas.Any(w => w.Level == ResponseType.Error.ToString()))
                     return new ApiResponse(ResponseType.Fail, "数据验证未通过，请修复后查看计算结果！", checkDatas.Where(w => w.Level == ResponseType.Error.ToString()));
 
@@ -752,7 +752,7 @@ public ApiResponse RedistributionSave([FromBody] SecondComputeDto request)
                 var loads = _redistributionService.GetWorkLoads(allot.HospitalId, second.UnitType, second.Department);
                 var workloadGroups = _redistributionService.GetTopWorkloadBodyGroups(loads);
                 // 二次分配人员信息 校验
-                var checkDatas = _redistributionService.CheckData(second, (ComputeMode)request.ComputeMode, request.Body, loads);
+                var checkDatas = _redistributionService.CheckData(allot, second, (ComputeMode)request.ComputeMode, request.Body, loads);
                 if (checkDatas != null && checkDatas.Any(w => w.Level == ResponseType.Error.ToString()))
                     return new ApiResponse(ResponseType.Fail, "数据验证未通过，请修复后查看计算结果！", checkDatas.Where(w => w.Level == ResponseType.Error.ToString()));
                 // 二次分配提交数据格式 校验
@@ -815,7 +815,7 @@ public ApiResponse RedistributionSubmit([FromBody] SecondComputeDto request)
                 var workloadGroups = _redistributionService.GetTopWorkloadBodyGroups(loads);
 
                 // 二次分配人员信息 校验
-                var checkDatas = _redistributionService.CheckData(second, (ComputeMode)request.ComputeMode, request.Body, loads);
+                var checkDatas = _redistributionService.CheckData(allot, second, (ComputeMode)request.ComputeMode, request.Body, loads);
                 if (checkDatas != null && checkDatas.Any(w => w.Level == ResponseType.Error.ToString()))
                     return new ApiResponse(ResponseType.Fail, "数据验证未通过，请修复后查看计算结果！", checkDatas.Where(w => w.Level == ResponseType.Error.ToString()));