diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 5d85f4742..46948b9c0 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -81,23 +81,23 @@ namespace IRaCIS.Core.Application.Service.Common t => t.UserRole.OrganizationName.Contains(param.OrganizationName)) .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName), t => (t.UserRole.FullName).Contains(param.UserRealName)) - .Select(t=>new TrialMaintenanceDTO() + .Select(t => new TrialMaintenanceDTO() { - UserRealName=t.UserRole.IdentityUser.FullName, - UserName=t.UserRole.IdentityUser.UserName, - UserType=t.UserRole.UserTypeRole.UserTypeShortName, - Phone=t.UserRole.IdentityUser.Phone, - EMail=t.UserRole.IdentityUser.EMail, - OrganizationName= t.UserRole.IdentityUser.OrganizationName, + UserRealName = t.UserRole.IdentityUser.FullName, + UserName = t.UserRole.IdentityUser.UserName, + UserType = t.UserRole.UserTypeRole.UserTypeShortName, + Phone = t.UserRole.IdentityUser.Phone, + EMail = t.UserRole.IdentityUser.EMail, + OrganizationName = t.UserRole.IdentityUser.OrganizationName, - IsDeleted=t.TrialUser.IsDeleted, - JoinTime=t.TrialUser.JoinTime, - RemoveTime=t.TrialUser.RemoveTime, + IsDeleted = t.TrialUser.IsDeleted, + JoinTime = t.TrialUser.JoinTime, + RemoveTime = t.TrialUser.RemoveTime, //角色授权禁用时间 - CreateTime=t.CreateTime, - DeletedTime=t.DeletedTime, - }).OrderBy(t=>t.UserRealName) + CreateTime = t.CreateTime, + DeletedTime = t.DeletedTime, + }).OrderBy(t => t.UserRealName) .ToListAsync(); exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId); @@ -2260,6 +2260,12 @@ namespace IRaCIS.Core.Application.Service.Common //病灶明细表 export_Template = StaticData.Export.ReadingLession_Export; } + else if (inQuery.ReadingExportType == ExportResult.TableOfAssessmentResults) + { + //阅片结果表 + export_Template = StaticData.Export.CommonReading_Export; + } + else if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export) { //OCT @@ -2268,7 +2274,7 @@ namespace IRaCIS.Core.Application.Service.Common else { //CDISC - export_Template = StaticData.Export.CDISC_Reading_Export; + export_Template = StaticData.Export.CDISC_Reading_Export; } @@ -2427,15 +2433,10 @@ namespace IRaCIS.Core.Application.Service.Common //有三部分组成 外层问题+ 没有配置病灶编号和类型+ 动态的表格问题 var dynamicLessionInfoList = item.QuestionAnswerList.Union(dynamicPartialLessionInfoList).ToList(); - //OCT 多个表格,但是只导出一个表格,有的问题答案就是空的 - if (dynamicLessionInfoList.Count > 0) - { - var cloneItem = item.Clone(); - cloneItem.QuestionAnswerList = dynamicLessionInfoList; - - list.Add(cloneItem); - } + var cloneItem = item.Clone(); + cloneItem.QuestionAnswerList = dynamicLessionInfoList; + list.Add(cloneItem); } } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 9f77a1d9c..ed8d4dafd 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1232,7 +1232,7 @@ namespace IRaCIS.Core.Application.Contracts public string TrialCode { get; set; } - public string TrialSiteSubjectCode => TrialSiteCode + SubjectCode; + public string TrialSiteSubjectCode => TrialCode + SubjectCode; //最晚拍片日期 public DateTime? LatestScanDate { get; set; }