Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs

@@ -97,6 +97,8 @@ namespace IRaCIS.Core.Application.ViewModel
         [NotDefault]
         public Guid TrialId { get; set; }
 
+        public string EmailTopic { get; set; } = string.Empty;
+
         public EmailBusinessScenario? BusinessScenarioEnum { get; set; }
 
         public CriterionType? CriterionTypeEnum { get; set; }

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -1674,6 +1674,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
             var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
 
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
+               .WhereIf(inQuery.EmailTopic.IsNotNullOrEmpty(), t => t.EmailTopic.Contains(inQuery.EmailTopic)||t.EmailTopicCN.Contains(inQuery.EmailTopic))
               .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.IsDistinguishCriteria == false)
               .WhereIf(inQuery.IsDistinguishCriteria == true, t => t.IsDistinguishCriteria == true)
               .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeList.Any(c => c == inQuery.CriterionTypeEnum))

IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs

@@ -92,6 +92,9 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<DicomSeries, DicomSeriesDTO>()
               .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.SubjectVisit.Subject.Code))
              .ForMember(o => o.VisitName, t => t.MapFrom(u => u.SubjectVisit.VisitName));
+            CreateMap<TaskSeries, DicomSeriesDTO>()
+            .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.SubjectVisit.Subject.Code))
+           .ForMember(o => o.VisitName, t => t.MapFrom(u => u.SubjectVisit.VisitName));
             CreateMap<SCPSeries, DicomSeriesDTO>();
 
 

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -28,6 +28,8 @@ namespace IRaCIS.Core.Application.Services
         IRepository<Subject> _subjectRepository,
         IRepository<DicomInstance> _dicomInstanceRepository,
         IRepository<TaskStudy> _taskStudyRepository,
+             IRepository<TaskSeries> _taskSeriesRepository,
+                 IRepository<TaskInstance> _taskInstanceRepository,
         IServiceProvider _serviceProvider,
         IRepository<DicomSeries> _dicomSeriesRepository,
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISubjectVisitService
@@ -337,29 +339,48 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         public async Task<DicomSeriesDTO> GetDicomSeriesInfo(GetDicomSeriesInfoInDto inDto)
         {
-            DicomSeriesDTO series = await _dicomSeriesRepository.Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            DicomSeriesDTO? series = await _dicomSeriesRepository.Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
-            var instanceList = await _dicomInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
+            if (series != null)
-               .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
+            {
+                var instanceList = await _dicomInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
+                              .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
 
 
 
-            series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+                series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
-                  new InstanceBasicInfo()
+                      new InstanceBasicInfo()
-                  {
+                      {
-                      Id = k.Id,
+                          Id = k.Id,
-                      NumberOfFrames = k.NumberOfFrames,
+                          NumberOfFrames = k.NumberOfFrames,
-                      HtmlPath = k.HtmlPath,
+                          HtmlPath = k.HtmlPath,
-                      Path = k.Path,
+                          Path = k.Path,
-                      InstanceNumber = k.InstanceNumber,
+                          InstanceNumber = k.InstanceNumber,
-                      FileSize = k.FileSize
+                          FileSize = k.FileSize
 
-                  }).ToList();
+                      }).ToList();
+            }
+            else
+            {
+                 series = await _taskSeriesRepository .Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+
+                var instanceList = await _taskInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
+                          .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
 
 
 
-            //series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
+                series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
-            //series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
+                      new InstanceBasicInfo()
+                      {
+                          Id = k.Id,
+                          NumberOfFrames = k.NumberOfFrames,
+                          HtmlPath = k.HtmlPath,
+                          Path = k.Path,
+                          InstanceNumber = k.InstanceNumber,
+                          FileSize = k.FileSize
+
+                      }).ToList();
+            }
 
             return series;
         }