修改表名

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -5967,11 +5967,6 @@
             ITrialExternalUserService
             </summary>	
         </member>
-        <member name="T:IRaCIS.Core.Application.Interfaces.ITrialUserPreparationService">
-            <summary>
-            ITrialUserPreparation Service
-            </summary>	
-        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.EmailNoticeConfigView">
             <summary> EmailNoticeConfigView  列表视图模型 </summary>
         </member>
@@ -8718,6 +8713,18 @@
             阅片问题.标准
             </summary>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCustomQuestionPreview(IRaCIS.Core.Application.Service.Reading.Dto.GetCustomQuestionPreviewInDto)">
+            <summary>
+            获取自定义问题预览
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCustomTableQuestionPreview(IRaCIS.Core.Application.Service.Reading.Dto.GetCustomQuestionPreviewInDto)">
+            <summary>
+            获取自定义表格问题预览
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCalculateQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateQuestionsInDto)">
             <summary>
             获取问题
@@ -9022,6 +9029,14 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingQuestion(System.Guid,System.Nullable{System.Guid})">
+            <summary>
+            获取阅片外层问题
+            </summary>
+            <param name="trialReadingCriterionId"></param>
+            <param name="visitTaskId"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
             <summary>
             获取阅片报告
@@ -9048,7 +9063,7 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingTableQuestion(System.Guid,System.Nullable{System.Guid},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo})">
             <summary>
-            获取表格问题及答案  只返回表格问题
+            获取表格问题及答案  只返回表格问题(任务和标准)
             </summary>
             <param name="trialReadingCriterionId"></param>
             <param name="taskId"></param>

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

@@ -21,13 +21,13 @@ namespace IRaCIS.Core.Application.Services
 
 
         private readonly IRepository<TrialDocument> _trialDocumentRepository;
-        private readonly IRepository<TrialDocUserTypeConfirmedUser> _trialDocUserTypeConfirmedUserRepository;
+        private readonly IRepository<TrialDocConfirmedUser> _trialDocUserTypeConfirmedUserRepository;
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
         private readonly IRepository<SystemDocument> _systemDocumentRepository;
 
         public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository,
-             IRepository<TrialDocUserTypeConfirmedUser> trialDocUserTypeConfirmedUserRepository,
+             IRepository<TrialDocConfirmedUser> trialDocUserTypeConfirmedUserRepository,
                   IRepository<Trial> trialRepository,
             IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository
             , IRepository<SystemDocument> systemDocumentRepository)
@@ -167,7 +167,7 @@ namespace IRaCIS.Core.Application.Services
                .WhereIf(!_userInfo.IsAdmin, t => t.IsDeleted == false || (t.IsDeleted == true && t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)))
 
                                     join trialUser in _repository.Where<TrialUser>(t => t.TrialId == querySystemDocument.TrialId && t.UserId == _userInfo.Id) on trialDoc.TrialId equals trialUser.TrialId
-                                    join confirm in _repository.Where<TrialDocUserTypeConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on
+                                    join confirm in _repository.Where<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on
                                     new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
                                     from confirm in cc.DefaultIfEmpty()
                                     select new UnionDocumentWithConfirmInfoView()
@@ -272,7 +272,7 @@ namespace IRaCIS.Core.Application.Services
                                                                               .WhereIf(querySystemDocument.UserTypeId != null, t => t.User.UserTypeId == querySystemDocument.UserTypeId)
                                                 on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
 
-                                join confirm in _repository.Where<TrialDocUserTypeConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on
+                                join confirm in _repository.Where<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on
                                  new { trialUser.UserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
                                 from confirm in cc.DefaultIfEmpty()
                                 select new UnionDocumentWithConfirmInfoView()
@@ -493,7 +493,7 @@ namespace IRaCIS.Core.Application.Services
                 if (!await _trialDocUserTypeConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.Id))
                 {
 
-                    await _repository.AddAsync(new TrialDocUserTypeConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
+                    await _repository.AddAsync(new TrialDocConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
 
                 }
 
@@ -526,7 +526,7 @@ namespace IRaCIS.Core.Application.Services
             if (!await _trialDocUserTypeConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.Id))
             {
 
-                await _repository.AddAsync(new TrialDocUserTypeConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
+                await _repository.AddAsync(new TrialDocConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
 
             }
             var success = await _repository.SaveChangesAsync();
@@ -613,7 +613,7 @@ namespace IRaCIS.Core.Application.Services
             else
             {
                 await _trialDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new TrialDocument() { IsDeleted = true });
-                await _trialDocUserTypeConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.TrialDocumentId == documentId, x => new TrialDocUserTypeConfirmedUser()
+                await _trialDocUserTypeConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.TrialDocumentId == documentId, x => new TrialDocConfirmedUser()
                 {
                     IsDeleted = true
                 });

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

@@ -40,7 +40,7 @@ namespace IRaCIS.Core.Application.Service
             //    .ForMember(t => t.UserConfirmInfo, c => c.MapFrom(t => t.TrialDocConfirmedUserList.Where(u => u.ConfirmUserId == userId).FirstOrDefault()))
             //    .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token)); ;
 
-            CreateMap<TrialDocUserTypeConfirmedUser, TrialDocumentUserConfirmView>()
+            CreateMap<TrialDocConfirmedUser, TrialDocumentUserConfirmView>()
                 .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName))
                 .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName));
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs

@@ -402,7 +402,7 @@ namespace IRaCIS.Application.Services
 
                                 await _repository.BatchDeleteAsync<TrialDocument>(t => t.TrialId == trialId) ||
                                await _repository.BatchDeleteAsync<TrialDocNeedConfirmedUserType>(t => t.TrialDocument.TrialId == trialId) ||
-                               await _repository.BatchDeleteAsync<TrialDocUserTypeConfirmedUser>(t => t.TrialDocument.TrialId == trialId) ||
+                               await _repository.BatchDeleteAsync<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == trialId) ||