XCKJ
/
CostCalculationItem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

master
he 2022-09-15 14:16:11 +08:00
parent eadd17f2c7
commit aaaaace8b6
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.Application/Financial/CalculateService.cs
View File

@ -888,15 +888,29 @@ namespace IRaCIS.Application.Services
public List<CalculateNeededDTO> GetNeedCalculateReviewerList(Guid reviewerId, string yearMonth)
{
Expression<Func<Payment, bool>> calculateLambda = u => !u.IsLock;
Expression<Func<Workload, bool>> workloadLambda = u => u.IsLock==false && u.DataFrom==(int)WorkLoadFromStatus.FinalConfirm;
if (reviewerId != Guid.Empty)
{
calculateLambda = calculateLambda.And(u => u.DoctorId == reviewerId);
workloadLambda = workloadLambda.And(u => u.DoctorId == reviewerId);
}
if (!string.IsNullOrWhiteSpace(yearMonth))
{
calculateLambda = calculateLambda.And(u => u.YearMonth == yearMonth);
workloadLambda = workloadLambda.And(u => u.YearMonth == yearMonth);
}
return _paymentRepository.Find(calculateLambda).ProjectTo<CalculateNeededDTO>(_mapper.ConfigurationProvider).ToList();
var workloadlist = _doctorWorkloadRepository.GetAll().Where(workloadLambda)
.Select(x => new CalculateNeededDTO()
{
DoctorId = x.DoctorId,
YearMonth = x.YearMonth,
IsLock = x.IsLock
}).Distinct().ToList();
return workloadlist;
// return _paymentRepository.Find(calculateLambda).ProjectTo<CalculateNeededDTO>(_mapper.ConfigurationProvider).ToList();
}
/// <summary>