工作量 添加/修改方法 微调

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);
         }