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

修改

master
he 2026-01-23 15:23:25 +08:00
parent d3bc5d4c03
commit e011071638
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Financial/TrialPaymentPriceService.cs
View File

@ -97,7 +97,7 @@ namespace IRaCIS.Application.Services.Pay
if (!string.IsNullOrEmpty(queryParam.KeyWord)) 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<TrialPaymentPriceDTO>(_mapper.ConfigurationProvider); var data= trialQueryable2.ProjectTo<TrialPaymentPriceDTO>(_mapper.ConfigurationProvider);

12
IRaCIS.Core.Application/Trial/Workload/TrialWorkloadService.cs
View File

@ -732,6 +732,9 @@ namespace IRaCIS.Application.Services
var needCount = month * workLoadSearch.WorkLoadFromStatus.Count ?? 1; 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 (workLoadSearch.WorkLoadFromStatus.Contains((int)WorkLoadFromStatus.FinalConfirm))
{ {
if (workLoadList.Count != needCount) if (workLoadList.Count != needCount)
@ -750,7 +753,8 @@ namespace IRaCIS.Application.Services
ChineseName = doctor.ChineseName, ChineseName = doctor.ChineseName,
FirstName = doctor.FirstName, FirstName = doctor.FirstName,
LastName = doctor.LastName, LastName = doctor.LastName,
Code = doctor.Code Code = doctor.Code,
Note= note
}); });
} }
} }
@ -774,7 +778,8 @@ namespace IRaCIS.Application.Services
ChineseName = doctor.ChineseName, ChineseName = doctor.ChineseName,
FirstName = doctor.FirstName, FirstName = doctor.FirstName,
LastName = doctor.LastName, LastName = doctor.LastName,
Code = doctor.Code Code = doctor.Code,
Note = note,
}); });
} }
} }
@ -798,7 +803,8 @@ namespace IRaCIS.Application.Services
ChineseName = doctor.ChineseName, ChineseName = doctor.ChineseName,
FirstName = doctor.FirstName, FirstName = doctor.FirstName,
LastName = doctor.LastName, LastName = doctor.LastName,
Code = doctor.Code Code = doctor.Code,
Note = note
}); });
} }
} }