diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 68ecb45ec..64760c043 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -20,7 +20,6 @@ using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infra.EFCore; using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure.Extention; -using Magicodes.ExporterAndImporter.Excel; using MassTransit; using MediatR; using Microsoft.AspNetCore.Authorization; @@ -39,7 +38,6 @@ using Microsoft.Net.Http.Headers; using MiniExcelLibs; using Newtonsoft.Json; using SharpCompress.Archives; -using SkiaSharp; using System; using System.Collections.Generic; using System.Data; @@ -237,10 +235,10 @@ namespace IRaCIS.Core.API.Controllers private readonly IMediator _mediator; - public IStringLocalizer _localizer { get; set; } + public IStringLocalizer _localizer { get; set; } - private readonly IWebHostEnvironment _hostEnvironment; + private readonly IWebHostEnvironment _hostEnvironment; private readonly IRepository _repository; @@ -255,7 +253,7 @@ namespace IRaCIS.Core.API.Controllers _hostEnvironment = hostEnvironment; _mediator = mediator; _localizer = localizer; - _mapper = mapper; + _mapper = mapper; _userInfo = userInfo; _repository = repository; } @@ -407,7 +405,7 @@ namespace IRaCIS.Core.API.Controllers } - catch (Exception ) + catch (Exception) { _provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}"); @@ -587,6 +585,20 @@ namespace IRaCIS.Core.API.Controllers #region MiniExcel 需要自己验证数据格式规范 + + if (fileName.EndsWith(".xlsx")) + { + etcCheckList = MiniExcel.Query(templateFileStream, excelType: ExcelType.XLSX).ToList(); + } + else if (fileName.EndsWith(".csv")) + { + //因为csv 需要加配置文件 不然都是null + etcCheckList = MiniExcel.Query(templateFileStream, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration() + { + StreamReaderFunc = (stream) => new StreamReader(stream, Encoding.GetEncoding("gb2312")) + }).ToList(); + + } //if (fileName.EndsWith(".csv")) //{ // //因为csv 需要加配置文件 不然都是null @@ -602,67 +614,72 @@ namespace IRaCIS.Core.API.Controllers #endregion + #region 升级net8 导入有问题 + + //Magicodes 支持自定义特性验证 - if (fileName.EndsWith(".xlsx")) - { - var Importer = new ExcelImporter(); + // if (fileName.EndsWith(".xlsx")) + //{ + // var Importer = new ExcelImporter(); - var import = await Importer.Import(templateFileStream); + // var import = await Importer.Import(templateFileStream); - if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString()); + // if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString()); - //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors)); + // //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors)); - if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(_localizer["UploadDownLoad_TemplateErrors"]); + // if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(_localizer["UploadDownLoad_TemplateErrors"]); - etcCheckList = import.Data.ToList(); - } - else if (fileName.EndsWith(".csv")) - { - #region 临时方案 MiniExcel读取 然后保存为xlsx 再用 Magicodes验证数据 + // etcCheckList = import.Data.ToList(); + //} + //else if (fileName.EndsWith(".csv")) + //{ + // #region 临时方案 MiniExcel读取 然后保存为xlsx 再用 Magicodes验证数据 - //因为csv 需要加配置文件 不然都是null - etcCheckList = MiniExcel.Query(templateFileStream, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration() - { - StreamReaderFunc = (stream) => new StreamReader(stream, Encoding.GetEncoding("gb2312")) - }).ToList(); + // //因为csv 需要加配置文件 不然都是null + // etcCheckList = MiniExcel.Query(templateFileStream, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration() + // { + // StreamReaderFunc = (stream) => new StreamReader(stream, Encoding.GetEncoding("gb2312")) + // }).ToList(); - var (csVToXlsxPath, csVToXlsxRelativePath) = FileStoreHelper.GetTrialCheckFilePath(_hostEnvironment, Path.GetFileNameWithoutExtension(fileName) + ".xlsx", trialId); + // var (csVToXlsxPath, csVToXlsxRelativePath) = FileStoreHelper.GetTrialCheckFilePath(_hostEnvironment, Path.GetFileNameWithoutExtension(fileName) + ".xlsx", trialId); - await MiniExcel.SaveAsAsync(csVToXlsxPath, etcCheckList, excelType: ExcelType.XLSX); + // await MiniExcel.SaveAsAsync(csVToXlsxPath, etcCheckList, excelType: ExcelType.XLSX); - var Importer = new ExcelImporter(); + // var Importer = new ExcelImporter(); - var import = await Importer.Import(System.IO.File.OpenRead(csVToXlsxPath)); + // var import = await Importer.Import(System.IO.File.OpenRead(csVToXlsxPath)); - if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString()); + // if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString()); - //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors)); + // //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors)); - if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors)); + // if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors)); - etcCheckList = import.Data.ToList(); + // etcCheckList = import.Data.ToList(); - #endregion + // #endregion - #region 导入组件有问题 excel编码格式 - //var Importer = new CsvImporter(); + // #region 导入组件有问题 excel编码格式 + // //var Importer = new CsvImporter(); - //var import = await Importer.Import(File.OpenRead(filePath)); + // //var import = await Importer.Import(File.OpenRead(filePath)); - //if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString()); + // //if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString()); - //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors)); + // //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors)); - //if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors)); + // //if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors)); - //etcCheckList = import.Data.ToList(); - #endregion + // //etcCheckList = import.Data.ToList(); + // #endregion - } + //} + + #endregion //ExcelReaderFactory 需要自己验证数据 并且从固定列取数据 else { @@ -966,14 +983,14 @@ namespace IRaCIS.Core.API.Controllers public IMapper _mapper { get; set; } public IUserInfo _userInfo { get; set; } private readonly IMediator _mediator; - public IStringLocalizer _localizer { get; set; } - private readonly IWebHostEnvironment _hostEnvironment; + public IStringLocalizer _localizer { get; set; } + private readonly IWebHostEnvironment _hostEnvironment; public UploadDownLoadController(IMapper mapper, IUserInfo userInfo, IStringLocalizer localizer, IMediator mediator, IWebHostEnvironment hostEnvironment) { _hostEnvironment = hostEnvironment; _localizer = localizer; - _mediator = mediator; + _mediator = mediator; _mapper = mapper; _userInfo = userInfo; } diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index 641d973d7..885b11f66 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -24,7 +24,6 @@ using IRaCIS.Core.Application.Filter; using Microsoft.AspNetCore.HttpOverrides; using IRaCIS.Application.Services.BackGroundJob; using LogDashboard; -using OfficeOpenXml.Utils; using FellowOakDicom.Network; using IRaCIS.Core.Application.Service.ImageAndDoc; using IP2Region.Net.Abstractions; diff --git a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs index 3eed41f3b..fb48b1d97 100644 --- a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs +++ b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs @@ -5,7 +5,6 @@ using IRaCIS.Application.Contracts; using IRaCIS.Application.Interfaces; using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Domain.Share; -using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using MiniExcelLibs; @@ -14,7 +13,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NPOI.HSSF.UserModel; using NPOI.XSSF.UserModel; -using SkiaSharp; using System.Collections; using System.IO; diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index c3431aa33..93c6c62bb 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -15,7 +15,6 @@ using System.Linq; using System.Security.AccessControl; using System.Text; using System.Threading.Tasks; -using SkiaSharp; namespace IRaCIS.Core.Application.Helper { diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj index ce8d240e6..0c907fb89 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj @@ -78,14 +78,6 @@ - - - true - - - true - - diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs index 4a0d7c680..7ab34919a 100644 --- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs +++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Authorization; using IRaCIS.Core.Application.Helper; using EasyCaching.Core; using IRaCIS.Core.Domain.Share; -using OfficeOpenXml.FormulaParsing.Utilities; namespace IRaCIS.Core.Application.Service { diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 92bbb0bd7..a86786d42 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -25,7 +25,6 @@ using Microsoft.AspNetCore.Http; using System; using System.Runtime.InteropServices; using SharpCompress.Common; -using SkiaSharp; using DocumentFormat.OpenXml.Bibliography; using System.Linq.Dynamic.Core; diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index c3a9b4f49..ab25b257f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -10,7 +10,6 @@ using MassTransit; using MathNet.Numerics; using Medallion.Threading; using Microsoft.AspNetCore.Mvc; -using OfficeOpenXml.FormulaParsing.Utilities; using System; using System.Collections.Generic; using System.IO.Compression; diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 1546ff3b0..bc3d7879a 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -18,7 +18,6 @@ using IRaCIS.Core.Domain.Share.Management; using System.Text.Json.Nodes; using IRaCIS.Application.Contracts; using IRaCIS.Core.Infrastructure.Extention; -using OfficeOpenXml.FormulaParsing.Excel.Functions.Information; namespace IRaCIS.Core.Application.Service { diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index fe1701878..9bcdaacac 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -15,7 +15,6 @@ using Medallion.Threading; using EasyCaching.Core; using IRaCIS.Core.Application.Contracts; using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO; -using OfficeOpenXml.FormulaParsing.Utilities; namespace IRaCIS.Application.Services { diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs index 1bfd22237..19ca221bf 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs @@ -16,7 +16,6 @@ using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Infrastructure.Extention; using IRaCIS.Core.Application.Service.Reading.Interface; using IRaCIS.Core.Application.Contracts; -using OfficeOpenXml.FormulaParsing.Excel.Functions.Information; namespace IRaCIS.Core.Application.Service { diff --git a/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs b/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs index d5a9e076c..a33e735cb 100644 --- a/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs +++ b/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs @@ -8,7 +8,6 @@ using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infrastructure; using Medallion.Threading; using Microsoft.AspNetCore.Mvc; -using OfficeOpenXml.FormulaParsing.Utilities; using System; using System.Collections.Generic; using System.Linq; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index e1f014663..9426b66dc 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations; using IRaCIS.Core.Infrastructure.Extention; using IRaCIS.Core.Domain.Share; -using Magicodes.ExporterAndImporter.Core; using MiniExcelLibs.Attributes; using Newtonsoft.Json; using IRaCIS.Core.Application.Contracts; @@ -74,28 +73,28 @@ namespace IRaCIS.Application.Contracts public string State => IsDeleted ? "退出" : "加入"; - [ValueMapping(text: "退出", true)] - [ValueMapping(text: "加入", false)] + //[ValueMapping(text: "退出", true)] + //[ValueMapping(text: "加入", false)] [DictionaryTranslateAttribute("IsUserExitTrial")] public bool IsDeleted { get; set; } - [ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")] + //[ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")] [ExcelFormat("yyyy-MM-dd hh:mm:ss")] public DateTime? DeletedTime { get; set; } - [ExporterHeader(Format = "yyyy-mm-DD")] + //[ExporterHeader(Format = "yyyy-mm-DD")] [ExcelFormat("yyyy-MM-dd")] public DateTime? RemoveTime { get; set; } - [ExporterHeader(Format = "yyyy-mm-DD")] + //[ExporterHeader(Format = "yyyy-mm-DD")] [ExcelFormat("yyyy-MM-dd")] public DateTime? JoinTime { get; set; } - [ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")] + //[ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")] [ExcelFormat("yyyy-MM-dd HH:mm:ss")] public DateTime CreateTime { get; set; } diff --git a/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs index cad9d1878..772176eda 100644 --- a/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Application.Interfaces Task AddOrUpdateVisitStage(VisitPlanCommand visitPlan); Task ConfirmTrialVisitPlan(Guid trialId); Task DeleteVisitStage(Guid id); - Task DownloadInflunceStudyList(Guid visitPlanInfluenceStatId); + //Task DownloadInflunceStudyList(Guid visitPlanInfluenceStatId); Task> GetInfluenceHistoryList(Guid trialId, [FromServices] IRepository _influnceStatRepository); Task> GetTrialVisitStageList(VisitPlanQueryDTO param); Task> GetTrialVisitStageSelect(Guid trialId); diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index 252eb8c2f..974a2ff1f 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -4,9 +4,6 @@ using IRaCIS.Core.Application.Filter; using Microsoft.AspNetCore.Mvc; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Application.MediatR.CommandAndQueries; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Excel; -using Magicodes.ExporterAndImporter.Excel.AspNetCore; using IRaCIS.Core.Infrastructure; using Microsoft.AspNetCore.Authorization; using IRaCIS.Core.Application.Auth; @@ -482,21 +479,21 @@ namespace IRaCIS.Application.Services return list; } - [HttpGet("{visitPlanInfluenceStatId:guid}")] - public async Task DownloadInflunceStudyList(Guid visitPlanInfluenceStatId) - { - var list = _influnceRepository.Where(t => t.VisitPlanInfluenceStatId == visitPlanInfluenceStatId) - .ProjectTo(_mapper.ConfigurationProvider).ToList(); + //[HttpGet("{visitPlanInfluenceStatId:guid}")] + //public async Task DownloadInflunceStudyList(Guid visitPlanInfluenceStatId) + //{ + // var list = _influnceRepository.Where(t => t.VisitPlanInfluenceStatId == visitPlanInfluenceStatId) + // .ProjectTo(_mapper.ConfigurationProvider).ToList(); - IExporter exporter = new ExcelExporter(); + // IExporter exporter = new ExcelExporter(); - var result = await exporter.ExportAsByteArray(list); + // var result = await exporter.ExportAsByteArray(list); - //$"检查导出_{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx" - return new XlsxFileResult(bytes: result, fileDownloadName: _localizer["VisitPlan_CheckExport", DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")]); + // //$"检查导出_{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx" + // return new XlsxFileResult(bytes: result, fileDownloadName: _localizer["VisitPlan_CheckExport", DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")]); - } + //} diff --git a/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs b/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs index 06387c87c..60629a40d 100644 --- a/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs +++ b/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs @@ -1,8 +1,4 @@ using IRaCIS.Core.Domain.Share; -using Magicodes.ExporterAndImporter.Core; -using Magicodes.ExporterAndImporter.Core.Filters; -using Magicodes.ExporterAndImporter.Core.Models; -using Magicodes.ExporterAndImporter.Excel; using MediatR; using MiniExcelLibs.Attributes; using System.ComponentModel.DataAnnotations; @@ -27,33 +23,33 @@ namespace IRaCIS.Core.Application.MediatR.CommandAndQueries - public class ImportResultFilteTest : IImportResultFilter - { + //public class ImportResultFilteTest : IImportResultFilter + //{ - public ImportResult Filter(ImportResult importResult) where T : class, new() - { - if (typeof(T).IsAssignableFrom(typeof(CheckViewModel))) - { - var data = (List)importResult.Data; + // public ImportResult Filter(ImportResult importResult) where T : class, new() + // { + // if (typeof(T).IsAssignableFrom(typeof(CheckViewModel))) + // { + // var data = (List)importResult.Data; - var dt = DateTime.Now ; + // var dt = DateTime.Now ; - foreach (var item in data) - { + // foreach (var item in data) + // { - var index= data.IndexOf(item); - if ( DateTime.TryParse(item.StudyDate, out dt) == false) - { + // var index= data.IndexOf(item); + // if ( DateTime.TryParse(item.StudyDate, out dt) == false) + // { - importResult.RowErrors.Add(new DataRowErrorInfo() { RowIndex = index, FieldErrors = new Dictionary { { StaticData.International("ConsistencyVerification_Tech") , StaticData.International("ConsistencyVerification_Time") } } }); - } - } - } + // importResult.RowErrors.Add(new DataRowErrorInfo() { RowIndex = index, FieldErrors = new Dictionary { { StaticData.International("ConsistencyVerification_Tech") , StaticData.International("ConsistencyVerification_Time") } } }); + // } + // } + // } - return importResult; - } - } + // return importResult; + // } + //} public class ParamInfoDto @@ -69,23 +65,23 @@ namespace IRaCIS.Core.Application.MediatR.CommandAndQueries } - [ExcelImporter(/*ImportResultFilter = typeof(ImportResultFilteTest),*/ IsLabelingError = true)] + //[ExcelImporter(/*ImportResultFilter = typeof(ImportResultFilteTest),*/ IsLabelingError = true)] public class CheckViewModel { //[Required(ErrorMessage = "中心编号不能为空")] - [ImporterHeader(Name = "Site ID", AutoTrim = true)] - [ExcelColumnIndex("Site ID")] + //[ImporterHeader(Name = "Site ID", AutoTrim = true)] + [ExcelColumnName("Site ID")] public string SiteCode { get; set; } = string.Empty; //[Required(ErrorMessage = "受试者筛选号不能为空")] - [ImporterHeader(Name = "Subject ID", AutoTrim = true)] + //[ImporterHeader(Name = "Subject ID", AutoTrim = true)] [ExcelColumnName("Subject ID")] public string SubjectCode { get; set; } = string.Empty; //[Required(ErrorMessage = "访视名称不能为空")] - [ImporterHeader(Name = "Visit Name", AutoTrim = true)] + //[ImporterHeader(Name = "Visit Name", AutoTrim = true)] [ExcelColumnName("Visit Name")] public string VisitName { get; set; } = string.Empty; @@ -94,14 +90,14 @@ namespace IRaCIS.Core.Application.MediatR.CommandAndQueries //[Required(ErrorMessage = "检查日期不能为空")] [CanConvertToTime(ErrorMessage = "Does not conform to Study Date format")] - [ImporterHeader(Name = "Study Date", AutoTrim = true)] + //[ImporterHeader(Name = "Study Date", AutoTrim = true)] [ExcelColumnName("Study Date")] public string StudyDate { get; set; } = string.Empty; //[Required(ErrorMessage = "Modality不能为空")] - [ImporterHeader(Name = "Modality", AutoTrim = true)] + //[ImporterHeader(Name = "Modality", AutoTrim = true)] [ExcelColumnName("Modality")] public string Modality { get; set; } = string.Empty; @@ -131,48 +127,48 @@ namespace IRaCIS.Core.Application.MediatR.CommandAndQueries public class VisitPlanInfluenceSubjectVisitDTO { - [ExporterHeader(IsIgnore = true)] + //[ExporterHeader(IsIgnore = true)] public Guid StudyId { get; set; } - [ExporterHeader(IsIgnore = true)] + //[ExporterHeader(IsIgnore = true)] public Guid TrialId { get; set; } - [ExporterHeader(IsIgnore = true)] + //[ExporterHeader(IsIgnore = true)] public Guid SubjectVisitId { get; set; } - [ExporterHeader(DisplayName = "中心编号")] + //[ExporterHeader(DisplayName = "中心编号")] public string TrialSiteCode { get; set; } = string.Empty; - [ExporterHeader(DisplayName = "受试者")] + //[ExporterHeader(DisplayName = "受试者")] public string SubjectCode { get; set; } = string.Empty; - [ExporterHeader(DisplayName = "访视名称")] + //[ExporterHeader(DisplayName = "访视名称")] public string VisitName { get; set; } = string.Empty; - [ExporterHeader(DisplayName = "检查时间", Format = "yyyy-mm-dd hh:mm:ss")] + //[ExporterHeader(DisplayName = "检查时间", Format = "yyyy-MM-dd HH:mm:ss")] public DateTime StudyTime { get; set; } - [ExporterHeader(DisplayName = "检查技术")] + //[ExporterHeader(DisplayName = "检查技术")] public string Modality { get; set; } = string.Empty; - [ExporterHeader(IsIgnore = true)] + //[ExporterHeader(IsIgnore = true)] public bool IsDicomStudy { get; set; } - [ExporterHeader(DisplayName = "影像类型")] + //[ExporterHeader(DisplayName = "影像类型")] public string ImageType => IsDicomStudy ? "Dicom" : "非Dicom"; - [ExporterHeader(DisplayName = "历史窗口")] + //[ExporterHeader(DisplayName = "历史窗口")] public string HistoryWindow { get; set; } = string.Empty; - [ExporterHeader(DisplayName = "之前超窗调整后没超窗")] - [ValueMapping(text: "yes", true)] - [ValueMapping(text: "no", false)] + //[ExporterHeader(DisplayName = "之前超窗调整后没超窗")] + //[ValueMapping(text: "yes", true)] + //[ValueMapping(text: "no", false)] public bool IsOverWindowNowNotOverWindow { get; set; } - [ExporterHeader(DisplayName = "目前窗口")] + //[ExporterHeader(DisplayName = "目前窗口")] public string NowWindow { get; set; } = string.Empty; - [ExporterHeader(IsIgnore = true)] + //[ExporterHeader(IsIgnore = true)] public DateTime CreateTime { get; set; } }