Merge branch 'feature/二次分配固定金额' into develop

performance/Performance.Services/EmployeeService.cs

@@ -1980,19 +1980,19 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather)
                         { "错误原因", $"人员字典中不存在工号[{newGather[i].PersonnelNumber}]" },
                     });
 
-                    var ExistNameData = employees.FirstOrDefault(w => w.AllotId == allotId && (w.DoctorName != null && w.DoctorName == newGather[i].DoctorName));
-                    if ((ExistNumberData == null || ExistNumberData.DoctorName != newGather[i].DoctorName)
-                    || (ExistNameData == null || ExistNameData.PersonnelNumber != newGather[i].PersonnelNumber))
-                        error.Add(new Dictionary<string, string>
-                    {
-                        { "行号", $"第{i+1}行" },
-                        { "科室", newGather[i].Department??"" },
-                        { "医生姓名", newGather[i].DoctorName??"" },
-                        { "人员工号", newGather[i].PersonnelNumber??"" },
-                        { "数值", newGather[i].Fee.ToString() },
-                        { "来源", "粘贴数据" },
-                        { "错误原因", $"该人员姓名和工号与人员字典中不匹配" },
-                    });
+                    //var ExistNameData = employees.FirstOrDefault(w => w.AllotId == allotId && (w.DoctorName != null && w.DoctorName == newGather[i].DoctorName));
+                    //if ((ExistNumberData == null || ExistNumberData.DoctorName != newGather[i].DoctorName)
+                    //|| (ExistNameData == null || ExistNameData.PersonnelNumber != newGather[i].PersonnelNumber))
+                    //    error.Add(new Dictionary<string, string>
+                    //{
+                    //    { "行号", $"第{i+1}行" },
+                    //    { "科室", newGather[i].Department??"" },
+                    //    { "医生姓名", newGather[i].DoctorName??"" },
+                    //    { "人员工号", newGather[i].PersonnelNumber??"" },
+                    //    { "数值", newGather[i].Fee.ToString() },
+                    //    { "来源", "粘贴数据" },
+                    //    { "错误原因", $"该人员姓名和工号与人员字典中不匹配" },
+                    //});
                 }
 
                 //if (accountingUnit.Login != "admin")

performance/Performance.Services/SecondAllotService.cs

@@ -1469,7 +1469,7 @@ public bool WorkloadAdd(WorkloadRequest request)
             if (workloadList.Any(t => t.ItemName == request.ItemName))
                 throw new PerformanceException("工作量项目名称重复");
             var workloadType = agworkloadtypeRepository.GetEntity(w => w.Id == request.WorkTypeId);
-            if (request.AgWorkloadType != AgWorkloadType.Workload)
+            if (request.AgWorkloadType > 0)
                 throw new PerformanceException("工作量类型信息错误，找不到对应的工作量类型信息");
 
             ag_workload workload = new ag_workload
@@ -1508,7 +1508,9 @@ public bool WorkloadUpdate(WorkloadRequest request)
             if (workloadList.Any(t => t.Id != request.Id && t.ItemName == request.ItemName))
                 throw new PerformanceException("工作量项目名称重复");
 
-            var workloadType = agworkloadtypeRepository.GetEntity(w => w.Id == request.WorkTypeId) ?? throw new PerformanceException("工作量类型信息错误，找不到对应的工作量类型信息");
+            var workloadType = agworkloadtypeRepository.GetEntity(w => w.Id == request.WorkTypeId);
+            if (request.AgWorkloadType > 0)
+                throw new PerformanceException("工作量类型信息错误，找不到对应的工作量类型信息");
             var workload = workloadList.FirstOrDefault(t => t.Id == request.Id) ?? throw new PerformanceException("工作量项目信息错误，找不到对应的工作量类型信息");
 
             workload.HospitalId = request.HospitalId;
@@ -1520,7 +1522,7 @@ public bool WorkloadUpdate(WorkloadRequest request)
             workload.Sort = request.Sort;
             workload.ItemId = getWorkloadItemId.Invoke(request.AgWorkloadType, request.WorkTypeId, workload.Id);
             workload.WorkTypeId = request.AgWorkloadType == AgWorkloadType.Workload ? request.WorkTypeId : (int)request.AgWorkloadType;
-            workload.Purpose = workloadType.Purpose;
+            workload.Purpose = workloadType?.Purpose ?? 0;
 
             return agworkloadRepository.Update(workload);
         }