Commit b1f787e6 by lcx

其他绩效可分配绩效

parent da02d1d6
...@@ -932,7 +932,7 @@ ...@@ -932,7 +932,7 @@
系统/标准科室字典 系统/标准科室字典
</summary> </summary>
<param name="hospitalId">医院Id</param> <param name="hospitalId">医院Id</param>
<param name="type">1系统科室 2标准科室 3核算单元</param> <param name="type">1系统科室 2标准科室 3核算单元 4行政后勤 5特殊核算组</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.PersonController.DeptWorkloadDetail(Performance.DtoModels.WorkDetailRequest)"> <member name="M:Performance.Api.Controllers.PersonController.DeptWorkloadDetail(Performance.DtoModels.WorkDetailRequest)">
......
...@@ -1435,6 +1435,13 @@ public List<ag_othersource> OtherList(int secondId, int userId) ...@@ -1435,6 +1435,13 @@ public List<ag_othersource> OtherList(int secondId, int userId)
?.Where(w => w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim()) ?.Where(w => w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
?.Sum(w => w.Amount); ?.Sum(w => w.Amount);
var distPerformance = rescomputeRepository.GetEntities(t => t.AllotID == second.AllotId && employees.Select(s => s.DoctorName).Contains(t.EmployeeName));
Func<per_employee, decimal?> getDistPerformance = (t) => 0;
if (second.UnitType == UnitType.行政后勤.ToString())
getDistPerformance = (t) => distPerformance
?.Where(w => w.EmployeeName?.Trim() == t.DoctorName?.Trim() && w.JobNumber?.Trim() == t.PersonnelNumber?.Trim())
?.Sum(w => w.GiveFee);
foreach (var item in result) foreach (var item in result)
{ {
var empl = employees.FirstOrDefault(w => w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim() && w.DoctorName?.Trim() == item.Name?.Trim()); var empl = employees.FirstOrDefault(w => w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim() && w.DoctorName?.Trim() == item.Name?.Trim());
...@@ -1442,6 +1449,7 @@ public List<ag_othersource> OtherList(int secondId, int userId) ...@@ -1442,6 +1449,7 @@ public List<ag_othersource> OtherList(int secondId, int userId)
{ {
item.ReservedRatio = empl.ReservedRatio; item.ReservedRatio = empl.ReservedRatio;
item.OtherPerformance = getAprAmount(empl); item.OtherPerformance = getAprAmount(empl);
item.DistPerformance = getDistPerformance(empl);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment