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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is running Details

Uat_IRC_Net8
he 2025-01-09 15:05:11 +08:00
parent 3a62189503 d3396d9683
commit 55ea791387
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,23 +81,23 @@ namespace IRaCIS.Core.Application.Service.Common
t => t.UserRole.OrganizationName.Contains(param.OrganizationName)) t => t.UserRole.OrganizationName.Contains(param.OrganizationName))
.WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName), .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName),
t => (t.UserRole.FullName).Contains(param.UserRealName)) t => (t.UserRole.FullName).Contains(param.UserRealName))
.Select(t=>new TrialMaintenanceDTO() .Select(t => new TrialMaintenanceDTO()
{ {
UserRealName=t.UserRole.IdentityUser.FullName, UserRealName = t.UserRole.IdentityUser.FullName,
UserName=t.UserRole.IdentityUser.UserName, UserName = t.UserRole.IdentityUser.UserName,
UserType=t.UserRole.UserTypeRole.UserTypeShortName, UserType = t.UserRole.UserTypeRole.UserTypeShortName,
Phone=t.UserRole.IdentityUser.Phone, Phone = t.UserRole.IdentityUser.Phone,
EMail=t.UserRole.IdentityUser.EMail, EMail = t.UserRole.IdentityUser.EMail,
OrganizationName= t.UserRole.IdentityUser.OrganizationName, OrganizationName = t.UserRole.IdentityUser.OrganizationName,
IsDeleted=t.TrialUser.IsDeleted, IsDeleted = t.TrialUser.IsDeleted,
JoinTime=t.TrialUser.JoinTime, JoinTime = t.TrialUser.JoinTime,
RemoveTime=t.TrialUser.RemoveTime, RemoveTime = t.TrialUser.RemoveTime,
//角色授权禁用时间 //角色授权禁用时间
CreateTime=t.CreateTime, CreateTime = t.CreateTime,
DeletedTime=t.DeletedTime, DeletedTime = t.DeletedTime,
}).OrderBy(t=>t.UserRealName) }).OrderBy(t => t.UserRealName)
.ToListAsync(); .ToListAsync();
exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId); exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
@ -2260,6 +2260,12 @@ namespace IRaCIS.Core.Application.Service.Common
//病灶明细表 //病灶明细表
export_Template = StaticData.Export.ReadingLession_Export; 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) else if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
{ {
//OCT //OCT
@ -2268,7 +2274,7 @@ namespace IRaCIS.Core.Application.Service.Common
else else
{ {
//CDISC //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(); var dynamicLessionInfoList = item.QuestionAnswerList.Union(dynamicPartialLessionInfoList).ToList();
//OCT 多个表格，但是只导出一个表格,有的问题答案就是空的
if (dynamicLessionInfoList.Count > 0)
{
var cloneItem = item.Clone(); var cloneItem = item.Clone();
cloneItem.QuestionAnswerList = dynamicLessionInfoList; cloneItem.QuestionAnswerList = dynamicLessionInfoList;
list.Add(cloneItem);
list.Add(cloneItem);
}
} }
} }

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

@ -1232,7 +1232,7 @@ namespace IRaCIS.Core.Application.Contracts
public string TrialCode { get; set; } public string TrialCode { get; set; }
public string TrialSiteSubjectCode => TrialSiteCode + SubjectCode; public string TrialSiteSubjectCode => TrialCode + SubjectCode;
//最晚拍片日期 //最晚拍片日期
public DateTime? LatestScanDate { get; set; } public DateTime? LatestScanDate { get; set; }