Commit 0d4c6f66 by ruyun.zhang

二次分配不参与分配月显示

parent c0dd265b
......@@ -4,6 +4,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using Performance.DtoModels;
using Performance.DtoModels.AppSettings;
using Performance.EntityModels;
......@@ -184,6 +185,24 @@ public List<SecondListResponse> GetSecondList(int userId)
secondList.AddRange(histroys.Where(w => !sids.Contains(w.Id)));
}
foreach (var item in allotList)
{
if (!secondList.Any(w => w.AllotId == item.ID && w.Year == item.Year && w.Month == item.Month))
{
secondList.Add(new ag_secondallot
{
AllotId = item.ID,
UseTempId = null,
Year = item.Year,
Month = item.Month,
UnitType = unitType.FirstOrDefault(),
Department = userInfo.User.Department,
RealGiveFee = 0,
PreRealGiveFee = 0,
Status = 0,
});
}
}
var list = _mapper.Map<List<SecondListResponse>>(secondList);
// 二次分配只支持单医院
......
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