修改对接bug

IRaCIS.Core.Application/Service/Document/Interface/ITrialDocumentService.cs

@@ -16,10 +16,10 @@ namespace IRaCIS.Core.Application.Contracts
         Task<IResponseOutput> UserAbandonDoc(Guid documentId, bool isSystemDoc);
         Task<IResponseOutput> AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument);
         Task<IResponseOutput> DeleteTrialDocument(Guid trialDocumentId, Guid trialId);
-        Task<(PageOutput<UnionDocumentWithConfirmInfoView>, object)> GetDocumentConfirmList(DocumentTrialUnionQuery querySystemDocument);
+        Task<IResponseOutput<PageOutput<UnionDocumentWithConfirmInfoView>>> GetDocumentConfirmList(DocumentTrialUnionQuery querySystemDocument);
         Task<PageOutput<TrialDocumentView>> GetTrialDocumentList(TrialDocumentQuery queryTrialDocument);
 
-        Task<IResponseOutput<PageOutput<UnionDocumentWithConfirmInfoView>> > GetUserDocumentList(TrialUserDocUnionQuery querySystemDocument);
+        Task<IResponseOutput<PageOutput<UnionDocumentWithConfirmInfoView>>> GetUserDocumentList(TrialUserDocUnionQuery querySystemDocument);
         Task<IResponseOutput> SetFirstViewDocumentTime(Guid documentId, bool isSystemDoc);
         Task<IResponseOutput> UserConfirm(UserConfirmCommand userConfirmCommand);
         Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId);

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

@@ -225,7 +225,6 @@ namespace IRaCIS.Core.Application.Services
 
             //系统文档查询
             var systemDocumentQueryable = from needConfirmedUserType in _systemDocNeedConfirmedUserTypeRepository.Where(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
-                                               //.Where(u => u.UserTypeRole.UserList.SelectMany(cc => cc.UserTrials.Where(t => t.TrialId == querySystemDocument.TrialId)).Any(e => e.Trial.TrialFinishedTime < u.SystemDocument.CreateTime))
                                                .WhereIf(trialInfo.TrialFinishedTime != null, u => u.SystemDocument.CreateTime < trialInfo.TrialFinishedTime)
                                                .WhereIf(!_userInfo.IsAdmin, t => t.SystemDocument.IsDeleted == false || (t.SystemDocument.IsDeleted == true && t.SystemDocument.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)))
 
@@ -356,7 +355,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(PageOutput<UnionDocumentWithConfirmInfoView>, object)> GetDocumentConfirmList(DocumentTrialUnionQuery inQuery)
+        public async Task<IResponseOutput< PageOutput<UnionDocumentWithConfirmInfoView>>> GetDocumentConfirmList(DocumentTrialUnionQuery inQuery)
         {
 
 
@@ -393,7 +392,7 @@ namespace IRaCIS.Core.Application.Services
 
             #endregion
 
-            var trialInfo = (await  _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
+            var trialInfo = (await  _trialRepository.Where(t => t.Id == inQuery.TrialId,ignoreQueryFilters:true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
 
             var trialDocQuery = from trialDocumentNeedConfirmedUserType in _trialDocNeedConfirmedUserTypeRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId)
                                 join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
@@ -486,7 +485,7 @@ namespace IRaCIS.Core.Application.Services
                       .CountAsync();
 
 
-            return (result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr = trialInfo.TrialStatusStr });
+            return ResponseOutput.Ok (result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr = trialInfo.TrialStatusStr });
         }
 
 

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -578,7 +578,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
-    public class TrialIamgeDownQuery:PageInput
+    public class TrialIamgeDownQuery : PageInput
     {
         [NotDefault]
         public Guid TrialId { get; set; }
@@ -595,6 +595,8 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime? DownloadEndTime { get; set; }
 
         public string? IP { get; set; }
+
+        public string? Name { get; set}
     }
 
     public class SubjectVisitTaskInfo

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

@@ -997,6 +997,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var query = _trialImageDownloadRepository.Where(t => t.TrialId == inQuery.TrialId)
                   .WhereIf(inQuery.SubjectCode.IsNotNullOrEmpty(), t => t.SubjectCode.Contains(inQuery.SubjectCode))
                   .WhereIf(inQuery.IP.IsNotNullOrEmpty(), t => t.IP.Contains(inQuery.IP))
+                   .WhereIf(inQuery.Name.IsNotNullOrEmpty(), t => t.CreateUser.UserName.Contains(inQuery.Name) || t.CreateUser.FullName.Contains(inQuery.Name))
                   .WhereIf(inQuery.ImageType != null, t => t.ImageType == inQuery.ImageType)
                   .WhereIf(inQuery.UserType != null, t => t.CreateUser.UserTypeEnum == inQuery.UserType)
                   .WhereIf(inQuery.IsSuccess != null, t => t.IsSuccess == inQuery.IsSuccess)

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

@@ -51,7 +51,7 @@ namespace IRaCIS.Core.Application.Contracts
             return await previousHistoryQueryable.ToListAsync();
         }
 
-        [HttpPost]
+        [HttpPost("{trialId:guid}")]
         public async Task<IResponseOutput<Guid>> AddOrUpdatePreviousHistory(PreviousHistoryAddOrEdit addOrEditPreviousHistory)
         {
             await _qCCommon.VerifyIsCRCSubmmitAsync(_subjectVisitRepository, _userInfo, addOrEditPreviousHistory.SubjectVisitId);