医院其他绩效备注汇总

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -341,7 +341,7 @@ public ApiResponse GetAprDetail([FromBody] AprAmountAuditRequest request)
                     {
                         Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
                         Value = s.Sum(sum => sum.Amount ?? 0),
-                        Remark = s.FirstOrDefault()?.Remark ?? "",
+                        Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)),
                     })
                 });
             return new ApiResponse(ResponseType.OK, "ok", result);
@@ -541,7 +541,7 @@ public ApiResponse AprOverview(int allotId)
                     Detail = t.GroupBy(group => group.PerforType).Select(s => new
                     {
                         Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
-                        Remark = s.FirstOrDefault()?.Remark ?? "",
+                        Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)),
                         Value = s.Sum(sum => sum.Amount ?? 0)
                     })
                 });
@@ -711,7 +711,7 @@ public ApiResponse GetAprHideDetail([FromBody] per_apr_amount request)
                     {
                         Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
                         Value = s.Sum(sum => sum.Amount ?? 0),
-                        Remark = s.FirstOrDefault()?.Remark ?? "",
+                        Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)),
                     })
                 });
             return new ApiResponse(ResponseType.OK, "ok", result);
@@ -901,7 +901,7 @@ public ApiResponse AprHideOverview(int allotId)
                     Detail = t.GroupBy(group => group.PerforType).Select(s => new
                     {
                         Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
-                        Remark = s.FirstOrDefault()?.Remark ?? "",
+                        Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)),
                         Value = s.Sum(sum => sum.Amount ?? 0)
                     })
                 });

performance/Performance.Services/EmployeeService.cs

@@ -2099,7 +2099,7 @@ public string AprListDownload(string name, int userId, List<view_per_apr_amount>
                     { "人员工号", item.Key.PersonnelNumber },
                     { "姓名", item.Key.DoctorName },
                 };
-                allTypes.ForEach(w => x.Add(w, ""));
+                allTypes.ForEach(w => x.Add(string.IsNullOrEmpty(w) ? "未知" : w, ""));
 
                 foreach (var type in item.GroupBy(group => group.PerforType))
                 {