1、用户参与项目统计数字

2、复核不允许申请重传
3、CDISC导表排序

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

@@ -3150,7 +3150,7 @@ namespace IRaCIS.Core.Application.Service.Common
                                     {
 
                                         //遍历病灶的每个问题
-                                        foreach (var lessionItem in lession.LessionAnswerList)
+                                        foreach (var lessionItem in lession.LessionAnswerList.OrderBy(t=>t.ShowOrder))
                                         {
 
                                             var cloneItem = item.Clone();

IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs

@@ -350,6 +350,8 @@ namespace IRaCIS.Application.Contracts
         public string ResearchProgramNo { get; set; }
 
         #endregion
+
+        public int JoinedTrialCount { get; set; }
     }
 
 

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

@@ -154,6 +154,7 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.IdentityUserId, c => c.MapFrom(t => t.Id));
             CreateMap<IdentityUser, UserListDTO>()
                .ForMember(d => d.TrialCode, u => u.MapFrom(s => s.Trial.TrialCode))
+               .ForMember(d => d.JoinedTrialCount, u => u.MapFrom(s => s.UserTrialList.Count()))
                .ForMember(d => d.ResearchProgramNo, u => u.MapFrom(s => s.Trial.ResearchProgramNo));
 
             CreateMap<UserAddUserType, UserRole>().ReverseMap();

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

@@ -1397,6 +1397,8 @@ namespace IRaCIS.Core.Application.Contracts
         [Comment("自定义单位")]
         public string CustomUnit { get; set; } = string.Empty;
 
+        public int ShowOrder { get; set; }
+
         #endregion
 
 

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

@@ -2534,6 +2534,12 @@ namespace IRaCIS.Core.Application.Image.QA
                 throw new BusinessValidationFailedException(_localizer["QCOperation_InvalidTransferStatus"]);
             }
 
+            if (sv.SecondReviewState == SecondReviewState.WaitAudit)
+            {
+                //复核的时候不允许申请重传
+                throw new BusinessValidationFailedException(_localizer["QCOperation_SecondReviewNoReUpload"]);
+            }
+
 
             if (qcChallenge.ReuploadEnum == QCChanllengeReuploadEnum.CRCReuploaded)
             {

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

@@ -305,7 +305,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingTableQuestionAnswer, CommonLessionQuestionAnswerInfo>()
                   //.ForMember(o => o.LessionCode, t => t.MapFrom(u => u.Lesion.RowMark))
                   //.ForMember(o => o.LessionType, t => t.MapFrom(u => (int?)u.ReadingQuestionTrial.LesionType))
-
+                  .ForMember(o => o.ShowOrder, t => t.MapFrom(u => u.ReadingTableQuestionTrial.ShowOrder))
                  .ForMember(o => o.CustomUnit, t => t.MapFrom(u => u.ReadingTableQuestionTrial.CustomUnit))
                  .ForMember(o => o.Unit, t => t.MapFrom(u => u.ReadingTableQuestionTrial.Unit))
                  .ForMember(o => o.TableQuesionId, t => t.MapFrom(u => u.ReadingTableQuestionTrial.Id))