只计算项目医生的信息
parent
e2360e2cd5
commit
21074a5ffe
|
@ -13,6 +13,7 @@ using System.Linq.Expressions;
|
||||||
using IRaCIS.Core.Domain.Interfaces;
|
using IRaCIS.Core.Domain.Interfaces;
|
||||||
using IRaCIS.Core.Domain.Models;
|
using IRaCIS.Core.Domain.Models;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
|
using System.Linq.Dynamic.Core;
|
||||||
|
|
||||||
namespace IRaCIS.Application.Services
|
namespace IRaCIS.Application.Services
|
||||||
{
|
{
|
||||||
|
@ -23,9 +24,11 @@ namespace IRaCIS.Application.Services
|
||||||
private readonly IReviewerPayInfoRepository _doctorPayInfoRepository;
|
private readonly IReviewerPayInfoRepository _doctorPayInfoRepository;
|
||||||
private readonly ITrialRepository _trialRepository;
|
private readonly ITrialRepository _trialRepository;
|
||||||
private readonly IDoctorRepository _doctorRepository;
|
private readonly IDoctorRepository _doctorRepository;
|
||||||
|
|
||||||
private readonly IWorkloadRepository _doctorWorkloadRepository;
|
private readonly IWorkloadRepository _doctorWorkloadRepository;
|
||||||
private readonly IRankPriceRepository _rankPriceRepository;
|
private readonly IRankPriceRepository _rankPriceRepository;
|
||||||
private readonly IPaymentDetailRepository _paymentDetailRepository;
|
private readonly IUserTrialRepository _userTrialRepository;
|
||||||
|
private readonly IPaymentDetailRepository _paymentDetailRepository;
|
||||||
private readonly IVolumeRewardService _volumeRewardPriceService;
|
private readonly IVolumeRewardService _volumeRewardPriceService;
|
||||||
private readonly IExchangeRateRepository _exchangeRateRepository;
|
private readonly IExchangeRateRepository _exchangeRateRepository;
|
||||||
private readonly IPaymentAdjustmentRepository _payAdjustmentRepository;
|
private readonly IPaymentAdjustmentRepository _payAdjustmentRepository;
|
||||||
|
@ -38,7 +41,8 @@ namespace IRaCIS.Application.Services
|
||||||
IDoctorRepository doctorRepository,
|
IDoctorRepository doctorRepository,
|
||||||
IWorkloadRepository workloadRepository,
|
IWorkloadRepository workloadRepository,
|
||||||
IRankPriceRepository rankPriceRepository,
|
IRankPriceRepository rankPriceRepository,
|
||||||
IPaymentDetailRepository paymentDetailRepository,
|
IUserTrialRepository userTrialRepository,
|
||||||
|
IPaymentDetailRepository paymentDetailRepository,
|
||||||
IVolumeRewardService volumeRewardService,
|
IVolumeRewardService volumeRewardService,
|
||||||
IExchangeRateRepository exchangeRateRepository,
|
IExchangeRateRepository exchangeRateRepository,
|
||||||
IEnrollRepository enrollRepository,
|
IEnrollRepository enrollRepository,
|
||||||
|
@ -52,7 +56,8 @@ namespace IRaCIS.Application.Services
|
||||||
_doctorRepository = doctorRepository;
|
_doctorRepository = doctorRepository;
|
||||||
_doctorWorkloadRepository = workloadRepository;
|
_doctorWorkloadRepository = workloadRepository;
|
||||||
_rankPriceRepository = rankPriceRepository;
|
_rankPriceRepository = rankPriceRepository;
|
||||||
_paymentDetailRepository = paymentDetailRepository;
|
this._userTrialRepository = userTrialRepository;
|
||||||
|
_paymentDetailRepository = paymentDetailRepository;
|
||||||
_volumeRewardPriceService = volumeRewardService;
|
_volumeRewardPriceService = volumeRewardService;
|
||||||
_exchangeRateRepository = exchangeRateRepository;
|
_exchangeRateRepository = exchangeRateRepository;
|
||||||
_payAdjustmentRepository = paymentAdjustmentRepository;
|
_payAdjustmentRepository = paymentAdjustmentRepository;
|
||||||
|
@ -915,9 +920,13 @@ namespace IRaCIS.Application.Services
|
||||||
IsLock = x.IsLock,
|
IsLock = x.IsLock,
|
||||||
DataFrom=x.DataFrom,
|
DataFrom=x.DataFrom,
|
||||||
}).Distinct().ToList();
|
}).Distinct().ToList();
|
||||||
var doctor = _doctorRepository.GetAll().Select(x => x.Id).ToList();
|
|
||||||
|
|
||||||
doctor.ForEach(x =>
|
var doctorIds = _enrollRepository.GetAll().Select(x => x.DoctorId).Distinct().ToList();
|
||||||
|
|
||||||
|
var doctorList = _doctorRepository.GetAll().Where(x=> doctorIds.Contains(x.Id)).Select(x => x.Id).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
doctorList.ForEach(x =>
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!workloadlist.Any(y => y.DoctorId == x))
|
if (!workloadlist.Any(y => y.DoctorId == x))
|
||||||
|
|
Loading…
Reference in New Issue