二次绩效详情、其他绩效统计表显示

performance/Performance.Api/Controllers/ComputeController.cs

@@ -393,8 +393,8 @@ public ApiResponse OtherPerStats(int allotId)
             if (employee==null)
                 return new ApiResponse(ResponseType.OK,null);
             
-            _computeService.GetOtherPerStats(employee);
-            return new ApiResponse();
+            var relust= _computeService.GetOtherPerStats(employee);
+            return new ApiResponse(ResponseType.OK,relust);
         }
 
         #endregion

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -401,11 +401,11 @@ public ApiResponse NursingDeptAuditResult([FromBody] SecondAuditRequest request)
         [HttpPost]
         public ApiResponse OtherList([FromBody] AgOtherRequest request)
         {
-            //var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
-            var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
+            var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
+            //var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
             var obj = new
             {
-                header = secondAllotService.OtherListHeader(request.SecondId, realAmount),
+                header = secondAllotService.OtherListHeader(request.SecondId, result?.Sum(t=>t.RealAmount)),
                 body = result,
             };
             return new ApiResponse(ResponseType.OK, obj);

performance/Performance.Services/ComputeService.cs

@@ -10,6 +10,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using Performance.DtoModels.Request;
+using Performance.DtoModels.Response;
 
 namespace Performance.Services
 {
@@ -1423,7 +1424,7 @@ public DeptDataDetails GetDoctorDetail(int computeId)
 
         public res_baiscnorm EditHospitalAvg(ComputerAvgRequest request)
         {
-            if (request.Id==0)
+            if (request.Id == 0)
             {
                 var baiscnorm = Mapper.Map<res_baiscnorm>(request);
                 if (!perforResbaiscnormRepository.Add(baiscnorm))
@@ -1433,13 +1434,13 @@ public res_baiscnorm EditHospitalAvg(ComputerAvgRequest request)
             else
             {
                 var baiscnorm = perforResbaiscnormRepository.GetEntity(t => t.ID == request.Id);
-                if (baiscnorm==null)
+                if (baiscnorm == null)
                     throw new PerformanceException($"ID不存在 ：{request.Id}");
-                
+
                 baiscnorm.TotelNumber = request.TotelNumber;
                 baiscnorm.TotelValue = request.TotelValue;
                 baiscnorm.AvgValue = request.AvgValue;
-                
+
                 //var baiscnorm = Mapper.Map<res_baiscnorm>(request);
                 if (!perforResbaiscnormRepository.Update(baiscnorm))
                     throw new PerformanceException("保存失败");
@@ -1447,11 +1448,39 @@ public res_baiscnorm EditHospitalAvg(ComputerAvgRequest request)
             }
         }
 
-        public List<string> GetOtherPerStats(List<per_apr_amount> employees)
+        public List<Dictionary<string, string>> GetOtherPerStats(List<per_apr_amount> employees)
         {
-            var emp = employees.Select(t => t.PerforType).Distinct();
-            
-            return new List<string>();
+            var perForType = employees.Select(t => t.PerforType).Distinct();
+            var doctor = employees.Select(t => t.DoctorName.Trim()).Distinct();
+            var others = new List<Dictionary<string, string>>();
+
+            foreach (var name in doctor)
+            {
+                var dicData = new Dictionary<string, string>();
+                var amount = employees.First(t => t.DoctorName == name);
+                var unitype = perforPeremployeeRepository.GetEntity(t =>
+                    t.DoctorName == name && t.JobNumber == amount.PersonnelNumber)?.UnitType;
+                dicData.Add("核算单元组别",unitype);
+                dicData.Add("核算单元",amount?.AccountingUnit??"");
+                dicData.Add("工号",amount?.PersonnelNumber??"");
+                dicData.Add("人员姓名",amount?.DoctorName??"");
+                
+                foreach (var type in perForType)
+                {
+                    
+                    var emp = employees.Where(t => t.PerforType == type && t.DoctorName == name)?.ToList();
+                    if (!emp.Any())
+                        dicData.Add(type,"0");
+                    else
+                        dicData.Add(type,Math.Round(Convert.ToDecimal(emp?.First()?.Amount),0).ToString());
+                }
+
+                var sum = employees.Where(c=>c.DoctorName==name)?.Sum(t => t.Amount);
+                dicData.Add("合计",Math.Round(Convert.ToDecimal(sum),0).ToString());
+                others.Add(dicData);
+            }
+
+            return others;
         }
     }
 }