diff --git a/IRaCIS.Core.Application/Financial/TrialPaymentPriceService.cs b/IRaCIS.Core.Application/Financial/TrialPaymentPriceService.cs index 8b482d2..b47a868 100644 --- a/IRaCIS.Core.Application/Financial/TrialPaymentPriceService.cs +++ b/IRaCIS.Core.Application/Financial/TrialPaymentPriceService.cs @@ -97,7 +97,7 @@ namespace IRaCIS.Application.Services.Pay if (!string.IsNullOrEmpty(queryParam.KeyWord)) { - trialQueryable2 = trialQueryable2.Where(o => o.Trial.Indication.Contains(queryParam.KeyWord)); + trialQueryable2 = trialQueryable2.Where(o => o.Trial.Indication.Contains(queryParam.KeyWord)|| o.Trial.Code.Contains(queryParam.KeyWord)); } var data= trialQueryable2.ProjectTo(_mapper.ConfigurationProvider); diff --git a/IRaCIS.Core.Application/Trial/Workload/TrialWorkloadService.cs b/IRaCIS.Core.Application/Trial/Workload/TrialWorkloadService.cs index 38cb006..ba86c14 100644 --- a/IRaCIS.Core.Application/Trial/Workload/TrialWorkloadService.cs +++ b/IRaCIS.Core.Application/Trial/Workload/TrialWorkloadService.cs @@ -732,6 +732,9 @@ namespace IRaCIS.Application.Services var needCount = month * workLoadSearch.WorkLoadFromStatus.Count ?? 1; + + var note = _trialRevenuesPriceRepository.GetAll().Where(x=>x.Id==workLoadSearch.TrialId).Select(x=>x.Note).FirstOrDefault(); + if (workLoadSearch.WorkLoadFromStatus.Contains((int)WorkLoadFromStatus.FinalConfirm)) { if (workLoadList.Count != needCount) @@ -750,7 +753,8 @@ namespace IRaCIS.Application.Services ChineseName = doctor.ChineseName, FirstName = doctor.FirstName, LastName = doctor.LastName, - Code = doctor.Code + Code = doctor.Code, + Note= note }); } } @@ -774,7 +778,8 @@ namespace IRaCIS.Application.Services ChineseName = doctor.ChineseName, FirstName = doctor.FirstName, LastName = doctor.LastName, - Code = doctor.Code + Code = doctor.Code, + Note = note, }); } } @@ -798,7 +803,8 @@ namespace IRaCIS.Application.Services ChineseName = doctor.ChineseName, FirstName = doctor.FirstName, LastName = doctor.LastName, - Code = doctor.Code + Code = doctor.Code, + Note = note }); } }