IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -136,7 +136,7 @@ namespace IRaCIS.Application.Services
 
         public async Task<EmailNoticeConfig> GetEmailConfigInfoAsync(EmailBusinessScenario scenario)
         {
-            var configInfo = await _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario).Include(t => t.EmailNoticeUserTypeList).FirstOrDefaultAsync();
+            var configInfo = await _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario).Include(t=>t.EmailNoticeUserTypeList).FirstOrDefaultAsync();
 
             if (configInfo == null)
             {
@@ -758,9 +758,7 @@ namespace IRaCIS.Application.Services
 
             var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-            var emialScenario = feedBack.VisitTaskId != null ? EmailBusinessScenario.IRImageError : (feedBack.SubjectVisitId != null ? EmailBusinessScenario.TrialSubjectVisitFeedBack : (feedBack.TrialId != null ? EmailBusinessScenario.TrialFeedBack : EmailBusinessScenario.SysFeedBack));
+            var emailConfigInfo = await GetEmailConfigInfoAsync(feedBack.VisitTaskId != null? EmailBusinessScenario.IRImageError:(feedBack.TrialId != null? EmailBusinessScenario.TrialFeedBack: EmailBusinessScenario.SysFeedBack));
-
-            var emailConfigInfo = await GetEmailConfigInfoAsync(emialScenario);
 
             var userTypeEnumList = emailConfigInfo.EmailNoticeUserTypeList.Where(t => t.EmailUserType == EmailUserType.To).Select(t => t.UserType).ToList();
 
@@ -773,11 +771,10 @@ namespace IRaCIS.Application.Services
                 messageToSend.To.Add(new MailboxAddress(email.FullName, email.EMail));
             }
 
-            var userNames = string.Join(',', emailList.Select(t => t.FullName));
-
             //影像阅片反馈 pm
             if (feedBack.VisitTaskId != null)
             {
+                var userNames = string.Join(',', emailList.Where(email => email.UserTypeEnum == UserTypeEnum.ProjectManager).Select(t => t.FullName));
 
                 var emailType = await _repository.Where<Dictionary>(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.IRImageError).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
 
@@ -786,7 +783,7 @@ namespace IRaCIS.Application.Services
 
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
-                    var topicStr = string.Format(input.topicStr, info.ResearchProgramNo, info.SubejctCode, info.VisitName);
+                    var topicStr = string.Format(input.topicStr, info.SubejctCode, info.VisitName, info.ResearchProgramNo);
 
                     var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
                          userNames,
@@ -807,38 +804,10 @@ namespace IRaCIS.Application.Services
                 await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.IRImageError, messageToSend, emailConfigFunc);
 
             }
-            else if (feedBack.SubjectVisitId != null)
-            {
-                var emailType = await _repository.Where<Dictionary>(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.TrialSubjectVisitFeedBack).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
-
-
-                var info = await _repository.Where<SubjectVisit>(t => t.Id == feedBack.SubjectVisitId).Select(t => new { t.Trial.ResearchProgramNo, t.Trial.TrialCode, SubejctCode = t.Subject.Code, t.VisitName }).FirstNotNullAsync();
-
-                Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-                {
-                    var topicStr = string.Format(input.topicStr, info.ResearchProgramNo, info.SubejctCode, info.VisitName);
-
-                    var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
-                         userNames,
-                        info.TrialCode,
-                        info.SubejctCode,
-                        info.VisitName,
-                        feedBack.CreateUser.UserTypeRole.UserTypeShortName,
-                         feedBack.CreateUser.FullName,
-                         emailType,
-                         feedBack.QuestionDescription,
-                         _systemEmailConfig.SiteUrl
-                        );
-
-                    return (topicStr, htmlBodyStr);
-                };
-
-
-                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.TrialSubjectVisit, messageToSend, emailConfigFunc);
-            }
             //项目相关的反馈  pm  admin
             else if (feedBack.TrialId != null)
             {
+                var userNames = string.Join(',', emailList.Where(email => email.UserTypeEnum == UserTypeEnum.ProjectManager || email.UserTypeEnum == UserTypeEnum.Admin).Select(t => t.FullName));
 
                 var emailType = await _repository.Where<Dictionary>(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.TrialFeedBack).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
 
@@ -866,10 +835,11 @@ namespace IRaCIS.Application.Services
                 await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.TrialFeedBack, messageToSend, emailConfigFunc);
 
             }
-            //项目无关的反馈  admin  
+            //项目无关的反馈  admin  zyss
             else
             {
 
+                var userNames = string.Join(',', emailList.Where(email => email.UserTypeEnum == UserTypeEnum.ZYSS || email.UserTypeEnum == UserTypeEnum.Admin).Select(t => t.FullName));
 
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {

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

@@ -90,7 +90,6 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(o => o.IsReading, t => t.MapFrom(u => u.DicomSerie.IsReading));
             CreateMap<DicomStudy, DicomStudyDTO>();
             CreateMap<DicomSeries, DicomSeriesDTO>();
-            CreateMap<SCPSeries, DicomSeriesDTO>();
 
 
 

IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs

@@ -113,7 +113,6 @@ namespace IRaCIS.Core.Application.Service
 
             var entity = await _userFeedBackRepository.InsertOrUpdateAsync(addOrEditUserFeedBack, true);
 
-            //任务反馈的添加更新都需要发送邮件，其他的是添加的时候发送
             if (addOrEditUserFeedBack.VisitTaskId != null || addOrEditUserFeedBack.Id == null)
             {
                 await mailService.UserFeedBackMail(entity.Id);

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

@@ -69,43 +69,6 @@ namespace IRaCIS.Application.Services
         }
 
 
-        [HttpGet]
-        public async Task<IResponseOutput<List<DicomSeriesDTO>>> GetPatientSeriesList(Guid scpStudyId,
-            [FromServices] IRepository<SCPSeries> _seriesRepository,
-            [FromServices] IRepository<SCPInstance> _instanceRepository
-            )
-        {
-
-            var seriesList = await _seriesRepository.Where(s => s.StudyId == scpStudyId).OrderBy(s => s.SeriesNumber).
-             ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
-             .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
-
-            var instanceList = await _instanceRepository.Where(s => s.StudyId == scpStudyId).OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
-                        .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber }).ToListAsync();//.GroupBy(u => u.SeriesId);
-
-            foreach (var series in seriesList)
-            {
-
-                series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
-                   new InstanceBasicInfo()
-                   {
-                       Id = k.Id,
-                       NumberOfFrames = k.NumberOfFrames,
-                       //HtmlPath = string.Empty,
-                       Path = k.Path,
-                       InstanceNumber = k.InstanceNumber,
-
-                   }).ToList();
-            }
-
-            var study = await _scpStudyRepository.FindAsync(scpStudyId);
-
-            return ResponseOutput.Ok(seriesList, study);
-        }
-
-
-
         /// <summary>
         /// scp 影像推送记录表
         /// </summary>

IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs

@@ -91,11 +91,7 @@ namespace IRaCIS.Core.Domain.Share
 
         SysFeedBack=26,
 
-        TrialFeedBack=27,
+        TrialFeedBack=27
-
-        TrialSubjectVisitFeedBack = 28,
-
-
 
     }