修改

IRaCIS.Core.Application.Contracts/AutoMapper/DomainToViewModelMappingProfile.cs

@@ -111,8 +111,8 @@ namespace IRaCIS.Core.Application.Contracts.AutoMapper
                   .ForMember(t => t.ReviewMode, u => u.MapFrom(t => t.Trial.ReviewMode.Value))
                 .ForMember(t => t.Cro, u => u.MapFrom(t => t.Trial.CRO.CROName))
                 .ForMember(t => t.Indication, u => u.MapFrom(t => t.Trial.Indication))
-                .ForMember(t => t.Expedited, u => u.MapFrom(t => t.Trial.Expedited))
-                .ForMember(t => t.DoctorsNames, u => u.MapFrom(t => string.Join(",", t.Trial.EnrollList.Select(x => x.Doctor.ChineseName))));
+                .ForMember(t => t.Expedited, u => u.MapFrom(t => t.Trial.Expedited));
+                //.ForMember(t => t.DoctorsNames, u => u.MapFrom(t => string.Join(",", t.Trial.EnrollList.Select(x => x.Doctor.ChineseName))));
         }
     }
 }

IRaCIS.Core.Application.Contracts/Doctor/DTO/DoctorViewModel.cs

@@ -197,9 +197,9 @@ namespace IRaCIS.Application.ViewModels
 
         public Guid? Id { get; set; }
 
-        public int? Training { get; set; }
+        public decimal? Training { get; set; }
 
-        public int? RefresherTraining { get; set; }
+        public decimal? RefresherTraining { get; set; }
 
         public int? Timepoint { get; set; }
 
@@ -216,7 +216,7 @@ namespace IRaCIS.Application.ViewModels
         public int? Global { get; set; }
 
 
-        public int? Downtime { get; set; }
+        public decimal? Downtime { get; set; }
 
         public string ReviewerCode { get; set; } = string.Empty;
 

IRaCIS.Core.Application.Contracts/Financial/DTO/CalculateViewModel.cs

@@ -20,9 +20,9 @@ namespace IRaCIS.Application.ViewModels
 
         public bool? IsNewTrial { get; set; }
 
-        public int? Training { get; set; }
+        public decimal? Training { get; set; }
 
-        public int? RefresherTraining { get; set; }
+        public decimal? RefresherTraining { get; set; }
 
         public int? Timepoint { get; set; }
 
@@ -39,6 +39,6 @@ namespace IRaCIS.Application.ViewModels
         public int? Global { get; set; }
 
 
-        public int? Downtime { get; set; }
+        public decimal? Downtime { get; set; }
     }
 }

IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs

@@ -13,7 +13,7 @@ namespace IRaCIS.Application.ViewModels.Pay
         public Guid TrialId { get; set; }
         public string TrialCode { get; set; }
         public string PaymentType { get; set; }
-        public int Count { get; set; }
+        public decimal Count { get; set; }
         public decimal BasePrice { get; set; }
         public decimal PersonalAdditional { get; set; }
         public decimal TrialAdditional { get; set; }
@@ -27,7 +27,7 @@ namespace IRaCIS.Application.ViewModels.Pay
 
         public bool? IsNewTrial { get; set; }
 
-        public decimal? NewPersonalAdditional { get; set; }
+        //public decimal? NewPersonalAdditional { get; set; }
 
         public decimal TotalUnitPrice => BasePrice + PersonalAdditional + TrialAdditional;
 
@@ -167,7 +167,7 @@ namespace IRaCIS.Application.ViewModels.Pay
         public string TrialCode { get; set; }
         public Guid TrialId { get; set; }
         public string Indication { get; set; }
-        public Guid CroId { get; set; }
+        public Guid? CroId { get; set; }
         public string Cro { get; set; } = string.Empty;
 
         public int Expedited { get; set; }

IRaCIS.Core.Application.Contracts/StatisticsViewModel.cs

@@ -63,7 +63,7 @@ namespace IRaCIS.Application.ViewModels
         public string TrialCode { get; set; }
         public Guid TrialId { get; set; }
         public string Indication { get; set; }
-        public Guid CroId { get; set; }
+        public Guid? CroId { get; set; }
         public string Cro { get; set; } = string.Empty;
         public string ChineseName { get; set; } = string.Empty;
 
@@ -71,8 +71,8 @@ namespace IRaCIS.Application.ViewModels
         public string LastName { get; set; } = string.Empty;
         public string ReviewerCode { get; set; } = string.Empty;
 
-        public int Training { get; set; }
-        public int Downtime { get; set; }
+        public decimal Training { get; set; }
+        public decimal Downtime { get; set; }
         public int Timepoint { get; set; }
         public int TimepointIn24H { get; set; }
         public int TimepointIn48H { get; set; }
@@ -81,7 +81,7 @@ namespace IRaCIS.Application.ViewModels
         public int AdjudicationIn48H { get; set; }
         public int Global { get; set; }
 
-        public int RefresherTraining { get; set; }
+        public decimal RefresherTraining { get; set; }
         
         public int PersonalTotal { get; set; }
     }

IRaCIS.Core.Application.Contracts/Trial/DTO/DoctorWorkLoadViewModel.cs

@@ -82,9 +82,9 @@ namespace IRaCIS.Application.ViewModels
 
         public DateTime WorkTime { get; set; }
 
-        public int Training { get; set; }
+        public decimal Training { get; set; }
 
-        public int Downtime { get; set; }
+        public decimal Downtime { get; set; }
 
         public int Timepoint { get; set; }
 
@@ -99,7 +99,7 @@ namespace IRaCIS.Application.ViewModels
         public int AdjudicationIn48H { get; set; }
 
         public int Global { get; set; }
-        public int RefresherTraining { get; set; }
+        public decimal RefresherTraining { get; set; }
 
 
     }
@@ -195,8 +195,8 @@ namespace IRaCIS.Application.ViewModels
 
         public string UpdateTimeStr => UpdateTime?.ToString("yyyy-MM-dd HH:mm:ss");
 
-        public int TrainingTimes { get; set; }
-        public int Downtime { get; set; }
+        public decimal TrainingTimes { get; set; }
+        public decimal Downtime { get; set; }
 
         //读片点
         public int Timepoint { get; set; }
@@ -211,7 +211,7 @@ namespace IRaCIS.Application.ViewModels
         //全局阅片
         public int Global { get; set; }
 
-        public int RefresherTraining { get; set; }
+        public decimal RefresherTraining { get; set; }
 
 
 

IRaCIS.Core.Application/Financial/FinancialService.cs

@@ -208,7 +208,7 @@ namespace IRaCIS.Application.Services
 
 
                 detailList =(from pay in _paymentDetailRepository.GetAll().Where(t => t.PaymentId == paymentId)
-                                   join enroll in _enrollRepository.GetAll() on new { pay.DoctorId, pay.TrialId } equals new { enroll.DoctorId, enroll.TrialId }
+                                   //join enroll in _enrollRepository.GetAll() on new { pay.DoctorId, pay.TrialId } equals new { enroll.DoctorId, enroll.TrialId }
                                    join price in _TrialPaymentPriceRepository.GetAll() on pay.TrialId equals price.TrialId
                                    orderby pay.ShowCodeOrder
                                    orderby pay.ShowTypeOrder
@@ -227,7 +227,7 @@ namespace IRaCIS.Application.Services
                                        DoctorId = pay.DoctorId,
                                        ExchangeRate = pay.ExchangeRate,
                                        IsNewTrial = price.IsNewTrial,
-                                       NewPersonalAdditional = enroll.AdjustmentMultiple,
+                                      // NewPersonalAdditional = enroll.AdjustmentMultiple,
                                        Count=pay.Count,
                                    }).ToList();
 
@@ -255,7 +255,7 @@ namespace IRaCIS.Application.Services
                               Note = costAdjustment.Note
                           },
                           IsNewTrial = price.IsNewTrial,
-                          NewPersonalAdditional = enroll.AdjustmentMultiple,
+                          //NewPersonalAdditional = enroll.AdjustmentMultiple,
 
                       }).ToList();
 
@@ -264,13 +264,13 @@ namespace IRaCIS.Application.Services
 
             detailList.AddRange(adjList);
 
-            detailList.ForEach(x =>
-            {
-                x.PersonalAdditional = x.IsNewTrial == true && x.NewPersonalAdditional != null ? 0 : x.PersonalAdditional;
-                x.TrialAdditional = x.IsNewTrial == true && x.NewPersonalAdditional != null ? 0 : x.TrialAdditional;
-                x.BasePrice = x.IsNewTrial == true && x.NewPersonalAdditional != null ? x.NewPersonalAdditional.Value : x.BasePrice;
+            //detailList.ForEach(x =>
+            //{
+            //    x.PersonalAdditional = x.IsNewTrial == true && x.NewPersonalAdditional != null ? 0 : x.PersonalAdditional;
+            //    x.TrialAdditional = x.IsNewTrial == true && x.NewPersonalAdditional != null ? 0 : x.TrialAdditional;
+            //    x.BasePrice = x.IsNewTrial == true && x.NewPersonalAdditional != null ? x.NewPersonalAdditional.Value : x.BasePrice;
 
-            });
+            //});
 
             returnModel.DetailList = detailList.OrderBy(x=>x.ShowCodeOrder).ThenBy(x=>x.ShowTypeOrder).ToList();
 
@@ -593,7 +593,7 @@ namespace IRaCIS.Application.Services
                             Indication = trial.Indication,
                             TrialCode = trial.Code,
                             Expedited = trial.Expedited,
-                            CroId = trial.CROId,
+                            CroId = trial.CROId ,
 
                             Downtime = workLoad.Downtime * trialCost.Downtime,
                             Training = workLoad.Training * trialCost.Training,

IRaCIS.Core.Application/Financial/TrialPaymentPriceService.cs

@@ -102,7 +102,26 @@ namespace IRaCIS.Application.Services.Pay
               
                 var data= trialQueryable2.ProjectTo<TrialPaymentPriceDTO>(_mapper.ConfigurationProvider);
 
+            // .ForMember(t => t.DoctorsNames, u => u.MapFrom(t => string.Join(",", t.Trial.EnrollList.Select(x => x.Doctor.ChineseName))));
+            var trialinfo = this._trialRepository.GetAll().Select(x => new
+            {
+                TrialId = x.Id,
+                Names = x.EnrollList.Select(y => y.Doctor).Select(y => y.ChineseName).ToList()
+
+            }).ToList();
+
+
+            var propName = string.IsNullOrWhiteSpace(queryParam.SortField) ? "SowName" : queryParam.SortField;
+            data = queryParam.Asc ? data.OrderBy(propName) : data.OrderByDescending(propName);
+
+         
+
+
             var list = data.Skip((queryParam.PageIndex - 1) * queryParam.PageSize).Take(queryParam.PageSize).ToList();
+            list.ForEach(x => {
+                x.DoctorsNames = string.Join(",", trialinfo.Where(y => y.TrialId == x.TrialId).Select(y => y.Names).ToList());
+            });
+
             return new PageOutput<TrialPaymentPriceDTO>(queryParam.PageIndex,
             queryParam.PageSize, data.Count(),
             list

IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs

@@ -16,9 +16,9 @@ namespace IRaCIS.Core.Domain.Models
 
         public DateTime WorkTime { get; set; }
 
-        public int Training { get; set; }
+        public decimal Training { get; set; }
 
-        public int Downtime { get; set; }
+        public decimal Downtime { get; set; }
 
         public int Timepoint { get; set; }
 
@@ -33,7 +33,7 @@ namespace IRaCIS.Core.Domain.Models
         public int AdjudicationIn48H { get; set; }
 
         public int Global { get; set; }
-        public int RefresherTraining { get; set; }
+        public decimal RefresherTraining { get; set; }
 
         public int CreateUserType { get; set; }
 

IRaCIS.Core.Domain/Trial/Enroll.cs

@@ -33,9 +33,9 @@ namespace IRaCIS.Core.Domain.Models
         public DateTime CreateTime { get; set; }
 
         #region 新的计费价格
-        public int? Training { get; set; }
+        public decimal? Training { get; set; }
 
-        public int? RefresherTraining { get; set; }
+        public decimal? RefresherTraining { get; set; }
 
         public int? Timepoint { get; set; }
 
@@ -52,7 +52,7 @@ namespace IRaCIS.Core.Domain.Models
         public int? Global { get; set; }
 
 
-        public int? Downtime { get; set; }
+        public decimal? Downtime { get; set; }
         #endregion
 
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -43,14 +43,14 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid CriterionId { get; set; } = Guid.Empty;
 
-        public Guid CROId { get; set; } = Guid.Empty;
+        public Guid? CROId { get; set; }
 
-        public Guid SponsorId { get; set; } = Guid.Empty;
+        public Guid? SponsorId { get; set; }
 
         [StringLength(500)]
         public string TurnaroundTime { get; set; } = string.Empty;
 
-        public Guid ReviewModeId { get; set; } = Guid.Empty;
+        public Guid? ReviewModeId { get; set; }
 
         public int ExpectedPatients { get; set; }