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

修改配置临时提交
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-01-06 17:29:53 +08:00
parent 1676516441
commit 6ead8ffd53
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1929,6 +1929,7 @@ namespace IRaCIS.Core.Application.Service.Common
var dynamicColumnConfig = new DynamicColumnConfig()
{
//可读的列表名行索引，不是{{}} 模板行索引
AutoColumnTitleRowIndex = 2,
AutoColumnStartIndex = 5,
TempalteLastColumnIndex = 4,
@ -2182,7 +2183,7 @@ namespace IRaCIS.Core.Application.Service.Common
var dynamicLessionTitleList = lessionAnserList.Select(t => new DymamicQuestionInfo { QuestionMark = t.QuestionMark, QuestionName = t.QuestionName, TranslateDicName = t.TranslateDicName }).Distinct();
var dynamicTitleList = dynamicExtraAddTitleList.Union(dynamicLessionTitleList).ToList();
//最终的病灶列表 要把裁判的也要加进去
//最终的病灶列表 要把裁判的也要加进去，需要处理裁判标记
list = new List<CommonEvaluationExport>();

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

@ -1168,6 +1168,8 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionValue { get; set; }
public string TranslateDicName { get; set; }
public string CDISCCode { get; set; }
}
public class CommonEvaluationExport
{
@ -1215,6 +1217,16 @@ namespace IRaCIS.Core.Application.Contracts
public string JudgeNote { get; set; } = string.Empty;
public string VisitNote { get; set; }
#region CDISC_阅片结果表
//最晚拍片日期
public DateTime? LatestScanDate { get; set; }
//阅片完成时间
public DateTime? SignTime { get; set; }
#endregion
}
public class CommonLessionExport : CommonEvaluationExport

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

@ -242,7 +242,8 @@ namespace IRaCIS.Core.Application.Service
QuestionType = c.ReadingQuestionTrial.QuestionType,
QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
TranslateDicName = c.ReadingQuestionTrial.DictionaryCode
TranslateDicName = c.ReadingQuestionTrial.DictionaryCode,
CDISCCode = c.ReadingQuestionTrial.CDISCCode
})))
;
@ -264,6 +265,7 @@ 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.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))
.ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
.ForMember(o => o.QuestionAnswerList, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList
@ -274,7 +276,8 @@ namespace IRaCIS.Core.Application.Service
QuestionType = c.ReadingQuestionTrial.QuestionType,
QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
TranslateDicName = c.ReadingQuestionTrial.DictionaryCode
TranslateDicName = c.ReadingQuestionTrial.DictionaryCode,
CDISCCode=c.ReadingQuestionTrial.CDISCCode
})))
;

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -1368,7 +1368,7 @@ namespace IRaCIS.Core.Application
extralConfig.TrialObjectNameList = extralObj.TrialObjectNameList;
extralConfig.CollectImagesEnum = extralConfig.CollectImagesEnum;
extralConfig.CollectImagesEnum = extralObj.CollectImagesEnum;
return extralConfig;
}