XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、用户参与项目统计数字
continuous-integration/drone/push Build is passing Details 

2、复核不允许申请重传
3、CDISC导表排序
Uat_IRC_Net8
hang 2025-07-30 11:15:03 +08:00
parent 62789f4cd8
commit e979649ef4
6 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -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();

2
IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
View File

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

1
IRaCIS.Core.Application/Service/Management/_MapConfig.cs
View File

@ -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();

2
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

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

6
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -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)
{

6
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -303,9 +303,9 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.LessionAnswerList, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.ExportResultStr.Contains(((int)readingExportType).ToString()))));
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.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))