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

修改

master
he 2022-09-14 17:43:12 +08:00
parent 5bf8004298
commit eadd17f2c7
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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