Merge branch '二次绩效历史人员' into custom_script

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -21,15 +21,19 @@ public class SecondAllotController : ControllerBase
         private readonly ClaimService claimService;
         private readonly SecondAllotService secondAllotService;
         private readonly ResultComputeService resultComputeService;
+        private readonly SecondAllotDetails secondAllotDetails;
 
         public SecondAllotController(
             ClaimService claimService,
             SecondAllotService secondAllotService,
-            ResultComputeService resultComputeService)
+            ResultComputeService resultComputeService,
+            SecondAllotDetails secondAllotDetails
+            )
         {
             this.claimService = claimService;
             this.secondAllotService = secondAllotService;
             this.resultComputeService = resultComputeService;
+            this.secondAllotDetails = secondAllotDetails;
         }
 
         #region 二次绩效列表、录入数据展示，保存数据
@@ -120,7 +124,8 @@ public ApiResponse SaveCompute([FromBody] List<ag_compute> request)
         [HttpPost]
         public ApiResponse SecondDetail([CustomizeValidator(RuleSet = "Refresh"), FromBody] UseTempRequest request)
         {
-            var result = secondAllotService.GetSecondDetail(request, claimService.GetUserId());
+            //var result = secondAllotService.GetSecondDetail(request, claimService.GetUserId());
+            var result = secondAllotDetails.GetSecondDetails(claimService.GetUserId(), request.SecondId, request.HospitalId, request.IsArchive, request.EmployeeSource);
             return new ApiResponse(ResponseType.OK, result);
         }
 
@@ -396,7 +401,8 @@ public ApiResponse NursingDeptAuditResult([FromBody] SecondAuditRequest request)
         [HttpPost]
         public ApiResponse OtherList([FromBody] AgOtherRequest request)
         {
-            var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
+            //var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
+            var result = secondAllotDetails.GetOtherTempDetails(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource);
             var obj = new
             {
                 header = secondAllotService.OtherListHeader(request.SecondId, result?.Sum(t => t.RealAmount)),

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

@@ -2247,6 +2247,9 @@
         <member name="P:Performance.DtoModels.UseTempRequest.IsArchive">
             <summary> 是否归档 </summary>
         </member>
+        <member name="P:Performance.DtoModels.UseTempRequest.EmployeeSource">
+            <summary> 人员信息来源 </summary>
+        </member>
         <member name="P:Performance.DtoModels.WorkItemRequest.Item">
             <summary>
             工作量绩效项

performance/Performance.DtoModels/Request/AgOtherRequest.cs

@@ -9,6 +9,10 @@ public class AgOtherRequest
     {
         public int SecondId { get; set; }
 
+        public int IsArchive { get; set; }
+
+        public int EmployeeSource { get; set; }
+
         public List<ag_othersource> Othersources { get; set; }
     }
 }

performance/Performance.DtoModels/Request/UseTempRequest.cs

@@ -19,7 +19,11 @@ public class UseTempRequest
 
         /// <summary> 是否归档 </summary>
         public int IsArchive { get; set; }
+
+        /// <summary> 人员信息来源 </summary>
+        public int EmployeeSource { get; set; }
     }
+
     public class UseTempRequestValidator : AbstractValidator<UseTempRequest>
     {
         public UseTempRequestValidator()

performance/Performance.DtoModels/Response/SecondResponse.cs

@@ -18,10 +18,13 @@ public class HeadItem : ICloneable
         public int Type { get; set; }
         public decimal FactorValue { get; set; }
         public int SourceType { get; set; }
+
         /// <summary> 1 带出历史数据 2不带出 </summary>
         public Nullable<int> IsBring { get; set; }
+
         /// <summary> 1 value相加值为1 </summary>
         public Nullable<int> SpecialAttr { get; set; }
+
         public Nullable<int> WorkType { get; set; }
 
         public object Clone()
@@ -34,5 +37,22 @@ public class BodyItem : HeadItem
     {
         public int RowNumber { get; set; }
         public string Value { get; set; }
+
+        public BodyItem()
+        {
+        }
+
+        public BodyItem(HeadItem headItem)
+        {
+            FiledId = headItem.FiledId;
+            FiledName = headItem.FiledName;
+            Sort = headItem.Sort;
+            Type = headItem.Type;
+            FactorValue = headItem.FactorValue;
+            SourceType = headItem.SourceType;
+            IsBring = headItem.IsBring;
+            SpecialAttr = headItem.SpecialAttr;
+            WorkType = headItem.WorkType;
+        }
     }
 }

performance/Performance.Services/SecondAllotService.cs

@@ -419,6 +419,7 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, int allotId, i
                 { ("姓名", "FullName"), (t) => t.DoctorName },
                 { ("岗位", "Post"), (t) => !string.IsNullOrEmpty(t.Duty) && (t.Duty.IndexOf("主任") > -1 || t.Duty.IndexOf("护士长") > -1) ? "主任" : "其他" },
                 { ("出勤", "ActualAttendance"), (t) => t.AttendanceDay },
+                { ("职称", "JobTitle"), (t) => t.JobTitle },
                 { ("预留比例", "ReservedRatio"), (t) => t.ReservedRatio },
                 { ("医院其他绩效","OtherPerformance"), (t) => getAprAmount(t)},
             };