计算绩效（添加行号）/管理绩效详情调整

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

@@ -515,6 +515,11 @@
             分值
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeEmployee.RowNumber">
+            <summary>
+            行号
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeEmployee.AccountType">
             <summary>
             科室类别(例如 医技科室 临床科室 其他科室)
@@ -655,6 +660,11 @@
             是否需要二次分配
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResult.RowNumber">
+            <summary>
+            行号
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeResult.AccountType">
             <summary>
             科室类别(例如 医技科室 临床科室 其他科室)

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

@@ -9218,6 +9218,11 @@
             
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_compute.RowNumber">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.res_compute.AllotID">
             <summary>
             

performance/Performance.DtoModels/PerExcel/ComputeEmployee.cs

@@ -5,6 +5,10 @@ namespace Performance.DtoModels
     public class ComputeEmployee
     {
         /// <summary>
+        /// 行号
+        /// </summary>
+        public Nullable<int> RowNumber { get; set; }
+        /// <summary>
         /// 科室类别(例如 医技科室 临床科室 其他科室)
         /// </summary>
         public string AccountType { get; set; }

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

@@ -5,6 +5,10 @@ namespace Performance.DtoModels
     public class ComputeResult
     {
         /// <summary>
+        /// 行号
+        /// </summary>
+        public Nullable<int> RowNumber { get; set; }
+        /// <summary>
         /// 科室类别(例如 医技科室 临床科室 其他科室)
         /// </summary>
         public string AccountType { get; set; }

performance/Performance.EntityModels/Entity/res_compute.cs

@@ -20,6 +20,10 @@ public class res_compute
         /// </summary>
         [Key]
         public int ID { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> RowNumber { get; set; }
 
         /// <summary>
         /// 

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -1175,7 +1175,7 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
                 if (temp == null) return new List<UniteDeptDetailResponse>();
                 resComputes.AddRange(temp);
             }
-            foreach (var resCompute in resComputes)
+            foreach (var resCompute in resComputes.OrderBy(o => o.RowNumber))
             {
                 var allot = perforPerallotRepository.GetEntity(t => t.ID == resCompute.AllotID) ?? throw new PerformanceException("绩效月信息错误");
                 if (!Enum.TryParse(resCompute.UnitType ?? resCompute.AccountType, ignoreCase: true, out UnitType unitType))
@@ -1187,11 +1187,31 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
                 var headers = _perforImheaderRepository.GetEntities(t => t.AllotID == resCompute.AllotID) ?? new List<im_header>();
                 var basicData = _perforImDataRepository.GetEntities(t => t.AllotID == resCompute.AllotID && t.AccountingUnit == resCompute.AccountingUnit && t.JobNumber == resCompute.JobNumber) ?? new List<im_data>();
 
-                var employee = _perforImemployeeclinicRepository.GetEntity(t => t.AllotID == resCompute.AllotID && t.AccountingUnit == resCompute.AccountingUnit && t.UnitType == resCompute.UnitType && t.PersonnelNumber == resCompute.JobNumber);
-
+                var employee = _perforImemployeeclinicRepository
+                    .GetEntity(t => t.AllotID == resCompute.AllotID
+                                 && t.AccountingUnit == resCompute.AccountingUnit
+                                 && t.UnitType == resCompute.UnitType
+                                 && t.PersonnelNumber == resCompute.JobNumber
+                                 && t.RowNumber == resCompute.RowNumber);
+                var tempResComputes = resComputes
+                    .Where(w => w.AllotID == resCompute.AllotID
+                             && w.AccountingUnit == resCompute.AccountingUnit
+                             && w.UnitType == resCompute.UnitType
+                             && w.JobNumber == resCompute.JobNumber).OrderBy(o => o.RowNumber).ToList();
+
+                string isMultiterm = "";
+                if (tempResComputes.Count > 1)
+                {
+                    isMultiterm = tempResComputes.FindIndex(t => t.RowNumber == resCompute.RowNumber) switch
+                    {
+                        0 => "1",
+                        1 => "2",
+                        _ => ""
+                    };
+                }
                 var response = new UniteDeptDetailResponse
                 {
-                    Title = $"{resCompute.EmployeeName}({resCompute.JobNumber}) {resCompute.JobTitle ?? ""} {resCompute.AccountingUnit}",
+                    Title = $"{resCompute.EmployeeName}({resCompute.JobNumber}) {resCompute.JobTitle ?? ""} {resCompute.AccountingUnit}  {isMultiterm}",
                     UnitType = resCompute?.UnitType,
                     AccountingUnit = resCompute?.AccountingUnit,
                     DetailItems = new List<DeptDetailItem>()

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

@@ -370,9 +370,10 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                     var effAvg = (empolyee.PermanentStaff == 0 ? 0 : resAccount.PerforTotal / empolyee.PermanentStaff) ?? 0;
 
                     //var efficiency = avg * (empolyee.Efficiency ?? 1);
-                    var scale = resAccount.PerforTotal * (empolyee.Scale ?? 1);
+                    //var scale = resAccount.PerforTotal * (empolyee.Scale ?? 1);
                     var compute = new ComputeResult
                     {
+                        RowNumber = empolyee.RowNumber,
                         UnitType = empolyee.UnitType,
                         AccountingUnit = empolyee.AccountingUnit,
 
@@ -474,6 +475,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
 
                     var compute = new ComputeResult
                     {
+                        RowNumber = item.RowNumber,
                         AccountType = item.AccountType,
                         AccountingUnit = item.AccountingUnit,
                         EmployeeName = item.DoctorName,