Merge remote-tracking branch 'origin/feature/新二次分配' into feature/新二次分配

performance/Performance.Services/SecondAllotService.cs

@@ -1360,7 +1360,16 @@ public List<ag_workload> GetWorkloadList(WorkloadRequest request)
         /// <returns></returns>
         public bool WorkloadAdd(WorkloadRequest request)
         {
-            var workloadList = agworkloadRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Department == request.Department && t.UnitType == request.UnitType);
+            Expression<Func<ag_workload, bool>> exp = (t) => t.HospitalId == request.HospitalId && t.Department == request.Department && t.UnitType == request.UnitType;
+            if (request.IsSingleAwards)
+            {
+                exp = exp.And(t => t.ItemId.StartsWith(AgWorkloadType.SingleAwards.ToString()));                
+            }
+            else
+            {
+                exp = exp.And(t => t.ItemId.StartsWith($"{AgWorkloadType.Workload}_"));
+            }
+            var workloadList = agworkloadRepository.GetEntities(exp);
             if (workloadList != null && workloadList.Any(t => t.ItemName == request.ItemName))
                 throw new PerformanceException("项目名称重复");
             ag_workload workload = new ag_workload
@@ -1391,7 +1400,16 @@ public bool WorkloadAdd(WorkloadRequest request)
         /// <returns></returns>
         public bool WorkloadUpdate(WorkloadRequest request)
         {
-            var workloadList = agworkloadRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Department == request.Department && t.UnitType == request.UnitType);
+            Expression<Func<ag_workload, bool>> exp = (t) => t.HospitalId == request.HospitalId && t.Department == request.Department && t.UnitType == request.UnitType;
+            if (request.IsSingleAwards)
+            {
+                exp = exp.And(t => t.ItemId.StartsWith(AgWorkloadType.SingleAwards.ToString()));
+            }
+            else
+            {
+                exp = exp.And(t => t.ItemId.StartsWith($"{AgWorkloadType.Workload}_"));
+            }
+            var workloadList = agworkloadRepository.GetEntities(exp);
             if (workloadList != null && workloadList.Any(t => t.Id != request.Id && t.ItemName == request.ItemName))
                 throw new PerformanceException("项目名称重复");