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

IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs

@@ -110,6 +110,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string Module { get; set; } = string.Empty;
 
+        public int? State { get; set; }
+
     }
 
     public class BatchAddInternationalizationDto : BatchInternationalizationDto

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

@@ -95,6 +95,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     RemoveTime = t.TrialUser.RemoveTime,
 
                     //角色授权禁用时间
+                    RoleIsDeleted=t.IsDeleted,
                     CreateTime = t.CreateTime,
                     DeletedTime = t.DeletedTime,
                 }).OrderBy(t => t.UserRealName)
@@ -545,7 +546,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var sysDocUserTypeList = _systemDocNeedConfirmedUserTypeRepository.Where(t => sysDocIdList.Contains(t.SystemDocumentId)).Select(t => new { t.SystemDocumentId, t.UserTypeRole.UserTypeShortName }).ToList();
 
-            var trialUserUserTypeList = _trialIdentityUserRepository.Where(t => t.TrialId == inQuery.TrialId && trialIdentityUserIdList.Contains(t.IdentityUserId)).Select(t => new { t.IdentityUserId, UserTypeList = t.TrialUserRoleList.Select(c => c.UserRole.UserTypeRole.UserTypeShortName).ToList() });
+            var trialUserUserTypeList = _trialIdentityUserRepository.Where(t => t.TrialId == inQuery.TrialId && trialIdentityUserIdList.Contains(t.IdentityUserId)).IgnoreQueryFilters().Select(t => new { t.IdentityUserId, UserTypeList = t.TrialUserRoleList.Select(c => c.UserRole.UserTypeRole.UserTypeShortName).ToList() });
 
 
             foreach (var item in list)
@@ -2415,7 +2416,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 //通过问题标识取并集
 
-                var dynamicTitleList = lessionAnserList.Select(t => new DymamicQuestionInfo { QuestionMark = t.QuestionMark, QuestionName = t.QuestionName, TranslateDicName = t.TranslateDicName }).Distinct();
+                var dynamicTitleList = lessionAnserList.Select(t => new DymamicQuestionInfo { QuestionMark = t.QuestionMark, QuestionName = t.QuestionName, TranslateDicName = t.TranslateDicName }).Distinct().ToList();
 
                 //最终的病灶列表  要把裁判的也要加进去，需要处理裁判标记
                 list = new List<CommonEvaluationExport>();
@@ -2426,18 +2427,14 @@ namespace IRaCIS.Core.Application.Service.Common
                     {
                         foreach (var lession in item.LesionList.OrderBy(t => t.LessionType).ThenBy(t => t.LessionCode))
                         {
-
                             var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode });
 
-
                             //有三部分组成  外层问题+ 没有配置病灶编号和类型+ 动态的表格问题
                             var dynamicLessionInfoList = item.QuestionAnswerList.Union(dynamicPartialLessionInfoList).ToList();
 
-
                             var cloneItem = item.Clone();
                             cloneItem.QuestionAnswerList = dynamicLessionInfoList;
                             list.Add(cloneItem);
-
                         }
                     }
                     else

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

@@ -73,11 +73,14 @@ namespace IRaCIS.Core.Application.Service
                 }
                 else
                 {
+
+                    var frontState = item.State == null ? 0 : (int)item.State;
+
                     var mapItem = _mapper.Map<Internationalization>(item);
                     mapItem.InternationalizationType = 0;
 
                     // 0 是预翻译  1是已确认  2是后端废弃
-                    mapItem.State = 0;
+                    mapItem.State = frontState;
 
                     find = await _internationalizationRepository.AddAsync(mapItem);
                 }

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

@@ -566,7 +566,7 @@ namespace IRaCIS.Core.Application.Services
 
             var sysDocUserTypeList = _systemDocNeedConfirmedUserTypeRepository.Where(t => sysDocIdList.Contains(t.SystemDocumentId)).Select(t => new { t.SystemDocumentId, t.UserTypeRole.UserTypeShortName }).ToList();
 
-            var trialUserUserTypeList = _trialIdentityUserRepository.Where(t => t.TrialId==inQuery.TrialId &&   trialIdentityUserIdList.Contains(t.IdentityUserId)).Select(t => new { t.IdentityUserId, UserTypeList = t.TrialUserRoleList.Select(c => c.UserRole.UserTypeRole.UserTypeShortName).ToList() });
+            var trialUserUserTypeList = _trialIdentityUserRepository.Where(t => t.TrialId==inQuery.TrialId &&   trialIdentityUserIdList.Contains(t.IdentityUserId)).IgnoreQueryFilters().Select(t => new { t.IdentityUserId, UserTypeList = t.TrialUserRoleList.Select(c => c.UserRole.UserTypeRole.UserTypeShortName).ToList() });
 
 
             foreach (var item in result.CurrentPageData)

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -1230,9 +1230,12 @@ namespace IRaCIS.Core.Application.Contracts
 
         #region CDISC_阅片结果表
 
-        public string TrialCode { get; set; }
+        public string ResearchProgramNo { get; set; } = string.Empty;
 
-        public string TrialSiteSubjectCode => TrialCode + SubjectCode;
+        public string VisitName { get; set; }
+
+
+        public string TrialSiteSubjectCode => ResearchProgramNo + SubjectCode;
 
         //最晚拍片日期
         public DateTime? LatestScanDate { get; set; }

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

@@ -265,7 +265,8 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(o => o.SubjectCriterionReadingPeriodVisitNumList, t => t.MapFrom(u =>
                 u.Subject.ReadModuleList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading).Select(c => c.SubjectVisit.VisitNum)))
 
-               .ForMember(o => o.TrialCode, t => t.MapFrom(u => u.Trial.TrialCode))
+               .ForMember(o => o.ResearchProgramNo, t => t.MapFrom(u => u.Trial.ResearchProgramNo))
+               .ForMember(o => o.VisitName, t => t.MapFrom(u => u.SourceSubjectVisit.VisitName))              
                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
                .ForMember(o => o.LatestScanDate, t => t.MapFrom(u => u.SourceSubjectVisit.LatestScanDate))
                .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
@@ -283,8 +284,9 @@ namespace IRaCIS.Core.Application.Service
                 })))
                ;
 
-            CreateMap<VisitTask, CommonLessionExport>().IncludeBase<VisitTask, CommonEvaluationExport>()
+            CreateMap<VisitTask, CommonLessionExport>()
-                 .ForMember(o => o.LesionList, t => t.MapFrom(u => u.LesionList));
+                .IncludeBase<VisitTask, CommonEvaluationExport>()
+                 .ForMember(o => o.LesionList, t => t.MapFrom(u => u.LesionList.Where(c => c.ReadingQuestionTrial.ExportResultStr.Contains(((int)readingExportType).ToString()))));
 
             CreateMap<ReadingTableAnswerRowInfo, CommonLessionInfo>()
                  .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark))

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -100,6 +100,10 @@ namespace IRaCIS.Application.Contracts
         [DictionaryTranslateAttribute("IsUserExitTrial")]
         public bool IsDeleted { get; set; }
 
+        [DictionaryTranslateAttribute("IsSiteDisable")]
+        
+        public bool RoleIsDeleted { get; set; }
+
         public DateTime? DeletedTime { get; set; }