修改一版
parent
121b3a09ec
commit
3eb2ff5e12
|
@ -83,7 +83,8 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
var subjectisd = pageList.CurrentPageData.Select(x => x.SubjectId).ToList();
|
||||
|
||||
var readModules =await _readModuleRepository.Where(x => subjectisd.Contains(x.SubjectId)).ToListAsync();
|
||||
var readModules =await _readModuleRepository.Where(x => subjectisd.Contains(x.SubjectId)).Include(x=>x.SubjectVisit)
|
||||
.Include(x => x.ReadModuleModel).ToListAsync();
|
||||
|
||||
pageList.CurrentPageData.ForEach(x => {
|
||||
x.Data.AddRange(readModules.Where(y => y.SubjectId == x.SubjectId).Select(
|
||||
|
@ -98,11 +99,11 @@ namespace IRaCIS.Application.Services
|
|||
SubjectCode= x.SubjectCode,
|
||||
SiteCode=x.SiteCode,
|
||||
SubjectVisitId= y.SubjectVisitId,
|
||||
SubjectVisitName=y.SubjectVisit.VisitName, // 截止访视名称
|
||||
SubjectVisitName=y.SubjectVisit?.VisitName, // 截止访视名称
|
||||
CutOffVisitId = y.SubjectVisitId, // 截止访视
|
||||
CutOffVisitName = y.SubjectVisit.VisitName, // 截止访视名称
|
||||
CutOffVisitName = y.SubjectVisit?.VisitName, // 截止访视名称
|
||||
ReadModuleId=y.ReadModuleId,
|
||||
ReadModuleName=y.ReadModuleModel.ModuleName,
|
||||
ReadModuleName=y.ReadModuleModel?.ModuleName,
|
||||
IsUrgent = y.IsUrgent
|
||||
|
||||
}));
|
||||
|
@ -183,9 +184,6 @@ namespace IRaCIS.Application.Services
|
|||
SubjectVisitId = visit.Id,
|
||||
Status = ReadModuleEnum.ImageRead,
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
var res = await _readModuleRepository.SaveChangesAsync();
|
||||
|
|
Loading…
Reference in New Issue