diff --git a/IRaCIS.Core.Application/Financial/CalculateService.cs b/IRaCIS.Core.Application/Financial/CalculateService.cs index cc8551b..947a34b 100644 --- a/IRaCIS.Core.Application/Financial/CalculateService.cs +++ b/IRaCIS.Core.Application/Financial/CalculateService.cs @@ -103,6 +103,7 @@ namespace IRaCIS.Application.Services TrialAdditional = trialPay.TrialAdditional, PersonalAdditional = doctorPayInfo.Additional, AdjustmentMultiple = trialPay.AdjustmentMultiple, + IsNewTrial = trialPay.IsNewTrial ?? false, TimepointPrice = rankPrice.Timepoint, TimepointIn24HPrice = rankPrice.TimepointIn24H, @@ -279,8 +280,8 @@ namespace IRaCIS.Application.Services PaymentType = "Timepoint Regular", Count = item.Timepoint, BasePrice = item.TimepointPrice, - PersonalAdditional = item.PersonalAdditional, - TrialAdditional = item.TimepointPrice * (item.AdjustmentMultiple - 1) + (item.TrialAdditional == null ? 0 : (decimal)item.TrialAdditional), + PersonalAdditional =0, + TrialAdditional = 0, PaymentId = Guid.Empty, DoctorId = item.DoctorId, TrialId = item.TrialId, @@ -298,8 +299,8 @@ namespace IRaCIS.Application.Services PaymentType = "Timepoint 48-Hour", Count = item.TimepointIn48H, BasePrice = item.TimepointIn48HPrice, - PersonalAdditional = item.PersonalAdditional, - TrialAdditional = item.TimepointIn48HPrice * (item.AdjustmentMultiple - 1) + 0,//48小时不加项目附加 + PersonalAdditional = 0, + TrialAdditional = 0,//48小时不加项目附加 PaymentId = Guid.Empty, DoctorId = item.DoctorId, TrialId = item.TrialId, @@ -316,8 +317,8 @@ namespace IRaCIS.Application.Services PaymentType = "Timepoint 24-Hour", Count = item.TimepointIn24H, BasePrice = item.TimepointIn24HPrice, - PersonalAdditional = item.PersonalAdditional, - TrialAdditional = item.TimepointIn24HPrice * (item.AdjustmentMultiple - 1) + 0, + PersonalAdditional = 0, + TrialAdditional = 0, PaymentId = Guid.Empty, DoctorId = item.DoctorId, TrialId = item.TrialId, @@ -334,8 +335,8 @@ namespace IRaCIS.Application.Services PaymentType = "Adjudication Regular", Count = item.Adjudication, BasePrice = item.AdjudicationPrice, - PersonalAdditional = item.PersonalAdditional, - TrialAdditional = item.AdjudicationPrice * (item.AdjustmentMultiple - 1) + (item.TrialAdditional == null ? 0 : (decimal)item.TrialAdditional), + PersonalAdditional = 0, + TrialAdditional = 0, PaymentId = Guid.Empty, DoctorId = item.DoctorId, TrialId = item.TrialId, @@ -353,8 +354,8 @@ namespace IRaCIS.Application.Services PaymentType = "Adjudication 48-Hour", Count = item.AdjudicationIn48H, BasePrice = item.AdjudicationIn48HPrice, - PersonalAdditional = item.PersonalAdditional, - TrialAdditional = item.AdjudicationIn48HPrice * (item.AdjustmentMultiple - 1) + 0, + PersonalAdditional =0, + TrialAdditional = 0, PaymentId = Guid.Empty, DoctorId = item.DoctorId, TrialId = item.TrialId, @@ -371,8 +372,8 @@ namespace IRaCIS.Application.Services PaymentType = "Adjudication 24-Hour", Count = item.AdjudicationIn24H, BasePrice = item.AdjudicationIn24HPrice, - PersonalAdditional = item.PersonalAdditional, - TrialAdditional = item.AdjudicationIn24HPrice * (item.AdjustmentMultiple - 1) + 0, + PersonalAdditional = 0, + TrialAdditional = 0, PaymentId = Guid.Empty, DoctorId = item.DoctorId, TrialId = item.TrialId, @@ -388,8 +389,8 @@ namespace IRaCIS.Application.Services TrialCode = item.TrialCode, PaymentType = "Global", Count = item.Global, - BasePrice = item.TimepointPrice / 2,//item.GlobalPrice, - PersonalAdditional = item.PersonalAdditional / 2, + BasePrice = item.GlobalPrice, + PersonalAdditional = 0, TrialAdditional = 0, PaymentId = Guid.Empty, DoctorId = item.DoctorId,