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

修改项目site 添加问题
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-06-07 13:55:01 +08:00
parent cc088900b6
commit cac0652120
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -555,8 +555,7 @@ namespace IRaCIS.Core.Application.Services
item.Description = "Key Series"; item.Description = "Key Series";
var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber). var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
item.Modality = string.Join(",", modalityList); item.Modality = string.Join(",", modalityList);
thisVisitTaskStudy.SeriesList.Add(item); thisVisitTaskStudy.SeriesList.Add(item);
thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count; thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count;
@ -604,8 +603,7 @@ namespace IRaCIS.Core.Application.Services
foreach (var t in studyList) foreach (var t in studyList)
{ {
t.SeriesList = seriesLists.Where(s => s.StudyId == t.StudyId).OrderBy(s => s.SeriesNumber). t.SeriesList = seriesLists.Where(s => s.StudyId == t.StudyId).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
ThenBy(s => s.SeriesTime).ToList();
t.SeriesList.ForEach(series => t.SeriesList.ForEach(series =>
{ {

6
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -1634,7 +1634,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var type = GetEntityAuditOpt(item); var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialSite; var entity = item.Entity as TrialSite;
if (entity.Site == null) if (entity.Site == null && entity.SiteId!=null)
{ {
entity.Site = await _dbContext.Site.Where(x => x.Id == entity.SiteId).FirstOrDefaultAsync(); entity.Site = await _dbContext.Site.Where(x => x.Id == entity.SiteId).FirstOrDefaultAsync();
} }
@ -1650,9 +1650,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
SiteCode = entity.TrialSiteCode, SiteCode = entity.TrialSiteCode,
//Site 没记录稽查 必须查询存 //Site 没记录稽查 必须查询存
SiteName = entity.Site.SiteName, SiteName = entity.TrialSiteName
City = entity.Site.City,
Country = entity.Site.Country,
}); });
} }