新增模板可提交，补充其他绩效（科室、核算单元类型）

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

@@ -1448,6 +1448,12 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.AutoCompleteBodyData(System.Int32,System.String)">
+            <summary>
+            二次绩效录入页面自动补全
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.SheetController.SheetList(Performance.DtoModels.SheetRequest)">
             <summary>
             sheet 列表

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

@@ -1403,11 +1403,6 @@
             
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ag_workload_source.UnitType">
-            <summary>
-            
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.ag_workload_source.ItemId">
             <summary>
             工作量考核项ID

performance/Performance.Services/SecondAllot/SecondAllotService.cs

@@ -216,17 +216,7 @@ private void SupplementOtherPerfor(ag_secondallot secondAllot, List<ag_bodysourc
                 foreach (var item in groupData)
                 {
                     var employee = employeeList.FirstOrDefault(w => w.PersonnelNumber == item.PersonnelNumber);
-                    if (employee == null)
-                    {
-                        bodyItems.Add(new ag_bodysource
-                        {
-                            WorkNumber = item.PersonnelNumber,
-                            Name = item.DoctorName,
-                            StaffCoefficient = 1,
-                            OtherPerformance = item.Amount
-                        });
-                    }
-                    else
+                    if (employee != null && employee.UnitType == secondAllot.UnitType)
                     {
                         bodyItems.Add(new ag_bodysource
                         {
@@ -377,8 +367,8 @@ public JArray AutoComplete(int secodId, string workNumber)
             if (usetemp == null)
                 throw new PerformanceException("当前科室暂未配置绩效模板");
 
-            var employees = peremployeeRepository.GetEntities(t => t.AllotId == allot.ID && !string.IsNullOrEmpty(t.PersonnelNumber) && t.PersonnelNumber.IndexOf(workNumber) > -1)
-                ?.OrderBy(t => t.PersonnelNumber).ThenByDescending(t => t.DoctorName).ToList();
+            var employees = peremployeeRepository.GetEntities(t => t.AllotId == allot.ID && t.UnitType == second.UnitType && !string.IsNullOrEmpty(t.PersonnelNumber)
+            && t.PersonnelNumber.IndexOf(workNumber) > -1)?.OrderBy(t => t.PersonnelNumber).ThenByDescending(t => t.DoctorName).ToList();
             if (employees == null || !employees.Any()) return new JArray();
 
             var bodysources = new List<ag_bodysource>();

performance/Performance.Services/SecondAllotService.cs

@@ -1210,7 +1210,7 @@ private void AddWorkTypeDefaultHeadValue(int hospitalId, ag_secondallot second)
             List<ag_worktype_source> insertData = new List<ag_worktype_source>(), updateData = new List<ag_worktype_source>();
             foreach (var type in worktypes)
             {
-                var sources = worktypeSources.Where(t => t.WorkTypeId == type.Id)?.ToList();
+                var sources = worktypeSources?.Where(t => t.WorkTypeId == type.Id).ToList();
                 if (sources != null && sources.Any())
                 {
                     sources.ForEach(t => t.FieldName = type.TypeName + t.FieldName.Substring(t.FieldName.Length - 2));
@@ -1232,9 +1232,9 @@ private void AddWorkTypeDefaultHeadValue(int hospitalId, ag_secondallot second)
             {
                 var amounts = insertData.Select(t => new ag_worktype_source
                 {
-                    WorkTypeId = t.Id,
+                    WorkTypeId = t.WorkTypeId,
                     SecondId = second.Id,
-                    FieldId = $"{AgWorkloadType.Workload}_Amount_{t.Id}",
+                    FieldId = $"{AgWorkloadType.Workload}_Amount_{t.WorkTypeId}",
                     FieldName = t.FieldName.Substring(0, t.FieldName.Length - 2) + "金额"
                 }).ToList();
                 insertData.AddRange(amounts);
@@ -1581,7 +1581,7 @@ public bool AuditSubmit(ag_secondallot second, int userId)
                 //if (!method(total, second.RealGiveFee))
                 //    throw new PerformanceException("总金额与考核后金额不一致！");
             }
-            else
+            else if (new int[] { 7, 8 }.Contains(temp.UseTempId.Value))
             {
                 var data = agfixatitemRepository.GetEntities(t => t.SecondId == second.Id);
                 if (data == null || !data.Any())
@@ -1592,6 +1592,12 @@ public bool AuditSubmit(ag_secondallot second, int userId)
                 //if (!method(total, second.RealGiveFee))
                 //    throw new PerformanceException("总金额与考核后金额不一致！");
             }
+            else if (new int[] { 9, 10 }.Contains(temp.UseTempId.Value))
+            {
+                var data = agbodysourceRepository.GetEntities(t => t.SecondId == second.Id);
+                if (data == null || !data.Any())
+                    throw new PerformanceException("提交时未检测到数据!");
+            }
             second.UseTempId = temp.UseTempId;
             second.Status = 2;
             second.NursingDeptStatus = 2;