IRaCIS.Core.Application/Financial/CalculateService.cs

@@ -13,8 +13,6 @@ using System.Linq.Expressions;
 using IRaCIS.Core.Domain.Interfaces;
 using IRaCIS.Core.Domain.Models;
 using System.Data;
-using System.Linq.Dynamic.Core;
-using System.Drawing;
 
 namespace IRaCIS.Application.Services
 {
@@ -25,10 +23,8 @@ namespace IRaCIS.Application.Services
         private readonly IReviewerPayInfoRepository _doctorPayInfoRepository;
         private readonly ITrialRepository _trialRepository;
         private readonly IDoctorRepository _doctorRepository;
-
         private readonly IWorkloadRepository _doctorWorkloadRepository;
         private readonly IRankPriceRepository _rankPriceRepository;
-		private readonly IUserTrialRepository _userTrialRepository;
         private readonly IPaymentDetailRepository _paymentDetailRepository;
         private readonly IVolumeRewardService _volumeRewardPriceService;
         private readonly IExchangeRateRepository _exchangeRateRepository;
@@ -42,7 +38,6 @@ namespace IRaCIS.Application.Services
             IDoctorRepository doctorRepository,
             IWorkloadRepository workloadRepository,
 			IRankPriceRepository rankPriceRepository,
-			IUserTrialRepository userTrialRepository,
             IPaymentDetailRepository paymentDetailRepository,
             IVolumeRewardService volumeRewardService,
             IExchangeRateRepository exchangeRateRepository,
@@ -57,7 +52,6 @@ namespace IRaCIS.Application.Services
             _doctorRepository = doctorRepository;
             _doctorWorkloadRepository = workloadRepository;
             _rankPriceRepository = rankPriceRepository;
-			this._userTrialRepository = userTrialRepository;
             _paymentDetailRepository = paymentDetailRepository;
             _volumeRewardPriceService = volumeRewardService;
             _exchangeRateRepository = exchangeRateRepository;
@@ -742,13 +736,6 @@ namespace IRaCIS.Application.Services
                 }
                 decimal totalUSD = award + totalNormal;//总费用
 
-                var paymentyearMonth = new DateTime(param.CalculateMonth.Year, param.CalculateMonth.Month, 1).ToString("yyyy-MM");
-				var paymentModel = _paymentRepository.GetAll().FirstOrDefault(t =>
-		      	 t.DoctorId == doctor && t.YearMonth == paymentyearMonth);
-
-                // 计算金额为0 就不插入
-                if (totalUSD != 0 || paymentModel != null)
-				{
                 result = AddOrUpdateMonthlyPayment(new PaymentCommand
                 {
                     DoctorId = doctor,
@@ -760,15 +747,14 @@ namespace IRaCIS.Application.Services
                     ExchangeRate = exchangeRate,
                     PaymentCNY = exchangeRate * totalUSD,
                 });
+
+
                 reviewerPaymentUSDList.Add(new ReviewerPaymentUSD { DoctorId = doctor, PaymentUSD = totalUSD, RecordId = result.Data });
                 foreach (var detail in paymentDetailList)
                 {
                     detail.PaymentId = result.Data;
                 }
                 AddOrUpdateMonthlyPaymentDetail(paymentDetailList, result.Data);
-				}
-			
-               
 
                 UpdatePaymentAdjustment(doctor, yearMonth);
             }
@@ -929,13 +915,9 @@ namespace IRaCIS.Application.Services
                     IsLock = x.IsLock,
                     DataFrom=x.DataFrom,
                 }).Distinct().ToList();
+            var doctor = _doctorRepository.GetAll().Select(x => x.Id).ToList();
 
-			var doctorIds = _enrollRepository.GetAll().Select(x => x.DoctorId).Distinct().ToList();
+            doctor.ForEach(x =>
-
-			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))