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-06 16:34:29 +08:00
parent cd03f5f31d
commit ca9a2dad18
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteViewModel.cs
View File

@ -38,9 +38,11 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public class TrialSiteCommand public class TrialSiteCommand
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid SiteId { get; set; } public Guid? SiteId { get; set; }
public string SiteName { get; set; } public string TrialSiteName { get; set; } = String.Empty;
public string TrialSiteAliasName { get; set; } = String.Empty;
public bool IsDeleted { get; set; } = true; public bool IsDeleted { get; set; } = true;

1
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -42,7 +42,6 @@ namespace IRaCIS.Core.Application.Service
CreateMap<UserTrialCommand, TrialUser>(); CreateMap<UserTrialCommand, TrialUser>();
CreateMap<TrialSiteCommand, TrialSite>() CreateMap<TrialSiteCommand, TrialSite>()
.ForMember(d => d.TrialSiteAliasName, u => u.MapFrom(s => s.SiteName))
.ForMember(x => x.Id, x => x.Ignore()); .ForMember(x => x.Id, x => x.Ignore());
CreateMap<EditTrialSiteCommand, TrialSite>(); CreateMap<EditTrialSiteCommand, TrialSite>();

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

@ -482,7 +482,7 @@ namespace IRaCIS.Core.Application.Services
{ {
var result = new List<VisitStudyDTO>(); var result = new List<VisitStudyDTO>();
var thisRowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x => x.ReadingQuestionTrial.ShowOrder).ThenBy(x => x.RowIndex).Select(x => new var rowInfoList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x => x.ReadingQuestionTrial.ShowOrder).ThenBy(x => x.RowIndex).Select(x => new
{ {
x.ReadingQuestionTrial.ShowOrder, x.ReadingQuestionTrial.ShowOrder,
x.RowIndex, x.RowIndex,
@ -497,9 +497,9 @@ namespace IRaCIS.Core.Application.Services
if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned) if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
{ {
var thisStudyIds = thisRowinfo.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.StudyId).Distinct().ToList(); var thisStudyIds = rowInfoList.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.StudyId).Distinct().ToList();
var thisSeriesIdIds = thisRowinfo.Where(x => x.SeriesId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.SeriesId).Distinct().ToList(); var thisSeriesIdIds = rowInfoList.Where(x => x.SeriesId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.SeriesId).Distinct().ToList();
if (thisRowinfo.Count > 0) if (rowInfoList.Count > 0)
{ {
var thisVisitTaskStudy = await _repository.Where<DicomStudy>(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO() var thisVisitTaskStudy = await _repository.Where<DicomStudy>(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO()
{ {
@ -523,7 +523,7 @@ namespace IRaCIS.Core.Application.Services
{ {
item.SeriesInstanceUid = string.Empty; item.SeriesInstanceUid = string.Empty;
var markInstanceIdList = thisRowinfo.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList(); var markInstanceIdList = rowInfoList.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList();
item.InstanceInfoList = await _repository.Where<DicomInstance>(t => markInstanceIdList.Contains(t.Id)).OrderBy(t => t.InstanceNumber).Select(k => item.InstanceInfoList = await _repository.Where<DicomInstance>(t => markInstanceIdList.Contains(t.Id)).OrderBy(t => t.InstanceNumber).Select(k =>
new InstanceBasicInfo() new InstanceBasicInfo()
@ -539,7 +539,7 @@ namespace IRaCIS.Core.Application.Services
item.InstanceInfoList.ForEach(x => item.InstanceInfoList.ForEach(x =>
{ {
var item = thisRowinfo.FirstOrDefault(y => y.InstanceId == x.Id); var item = rowInfoList.FirstOrDefault(y => y.InstanceId == x.Id);
if (item != null) if (item != null)
{ {
x.ShowOrder = item.ShowOrder; x.ShowOrder = item.ShowOrder;
@ -600,9 +600,8 @@ namespace IRaCIS.Core.Application.Services
List<DicomSeriesDTO> seriesLists = await _repository.Where<DicomSeries>(s => studyIds.Contains(s.StudyId) /*&& s.IsReading*/) List<DicomSeriesDTO> seriesLists = await _repository.Where<DicomSeries>(s => studyIds.Contains(s.StudyId) /*&& s.IsReading*/)
.WhereIf(isManualGenerate == false, t => t.IsReading) .WhereIf(isManualGenerate == false, t => t.IsReading)
.WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading)) .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
.OrderBy(s => s.SeriesNumber). .OrderBy(s => s.SeriesNumber). ThenBy(s => s.SeriesTime).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
ThenBy(s => s.SeriesTime)
.ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
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).
@ -692,7 +691,7 @@ namespace IRaCIS.Core.Application.Services
{ {
x.SeriesList.ForEach(y => x.SeriesList.ForEach(y =>
{ {
y.IsBeMark = thisRowinfo.Any(z => z.SeriesId == y.Id); y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
}); });
}); });