XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Uat_Study
he 2022-06-01 18:08:43 +08:00
parent 121b3a09ec
commit 3eb2ff5e12
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
View File

@ -83,7 +83,8 @@ namespace IRaCIS.Application.Services
var subjectisd = pageList.CurrentPageData.Select(x => x.SubjectId).ToList(); 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 => { pageList.CurrentPageData.ForEach(x => {
x.Data.AddRange(readModules.Where(y => y.SubjectId == x.SubjectId).Select( x.Data.AddRange(readModules.Where(y => y.SubjectId == x.SubjectId).Select(
@ -98,11 +99,11 @@ namespace IRaCIS.Application.Services
SubjectCode= x.SubjectCode, SubjectCode= x.SubjectCode,
SiteCode=x.SiteCode, SiteCode=x.SiteCode,
SubjectVisitId= y.SubjectVisitId, SubjectVisitId= y.SubjectVisitId,
SubjectVisitName=y.SubjectVisit.VisitName, // 截止访视名称 SubjectVisitName=y.SubjectVisit?.VisitName, // 截止访视名称
CutOffVisitId = y.SubjectVisitId, // 截止访视 CutOffVisitId = y.SubjectVisitId, // 截止访视
CutOffVisitName = y.SubjectVisit.VisitName, // 截止访视名称 CutOffVisitName = y.SubjectVisit?.VisitName, // 截止访视名称
ReadModuleId=y.ReadModuleId, ReadModuleId=y.ReadModuleId,
ReadModuleName=y.ReadModuleModel.ModuleName, ReadModuleName=y.ReadModuleModel?.ModuleName,
IsUrgent = y.IsUrgent IsUrgent = y.IsUrgent
})); }));
@ -183,9 +184,6 @@ namespace IRaCIS.Application.Services
SubjectVisitId = visit.Id, SubjectVisitId = visit.Id,
Status = ReadModuleEnum.ImageRead, Status = ReadModuleEnum.ImageRead,
}); });
var res = await _readModuleRepository.SaveChangesAsync(); var res = await _readModuleRepository.SaveChangesAsync();