From 55b98cae7b16dadee64c816218a4c3be1e8c0ba3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 10 Nov 2022 09:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=B4=E5=BA=8A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClinicalData/ClinicalDataSetService.cs | 236 +++++++++++------- .../ReadingClinicalDataService.cs | 4 +- .../Dto/ClinicalDataServiceViewModel.cs | 17 +- .../Service/Reading/_MapConfig.cs | 10 +- .../ClinicalData/ClinicalDataSystemSet.cs | 11 +- .../ClinicalData/ClinicalDataTrialSet.cs | 8 +- 6 files changed, 187 insertions(+), 99 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs index 9448ad8af..14e2be8a7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs @@ -62,20 +62,22 @@ namespace IRaCIS.Application.Services return ResponseOutput.NotOk("存在同类型的临床数据,操作失败"); } + indto.CriterionEnumListStr= $"|{String.Join('|', indto.CriterionEnumList)}|"; + var entity = await _clinicalDataSystemSetRepository.InsertOrUpdateAsync(indto); - entity.SystemClinicalDataCriterionList = indto.SystemCriterionIdList.Select(t => new SystemClinicalDataCriterion() - { - SystemClinicalDataSetId = entity.Id, - SystemReadingCriterionId = t - }).ToList(); + //entity.SystemClinicalDataCriterionList = indto.SystemCriterionIdList.Select(t => new SystemClinicalDataCriterion() + //{ + // SystemClinicalDataSetId = entity.Id, + // SystemReadingCriterionId = t + //}).ToList(); - if (indto.Id != null) - { - await _systemClinicalDataCriterionRepository.BatchDeleteNoTrackingAsync(t => t.SystemClinicalDataSetId == entity.Id); + //if (indto.Id != null) + //{ + // await _systemClinicalDataCriterionRepository.BatchDeleteNoTrackingAsync(t => t.SystemClinicalDataSetId == entity.Id); - await _systemClinicalDataCriterionRepository.AddRangeAsync(entity.SystemClinicalDataCriterionList); - } + // await _systemClinicalDataCriterionRepository.AddRangeAsync(entity.SystemClinicalDataCriterionList); + //} await _clinicalDataSystemSetRepository.SaveChangesAsync(); @@ -131,20 +133,25 @@ namespace IRaCIS.Application.Services return ResponseOutput.NotOk("存在同类型的临床数据,操作失败"); } + indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|"; + var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto, true); - entity.TrialClinicalDataCriterionList = indto.TrialCriterionIdList.Select(t => new TrialClinicalDataCriterion() - { - TrialClinicalDataSetId = entity.Id, - TrialReadingCriterionId = t - }).ToList(); + //entity.TrialClinicalDataCriterionList = indto.TrialCriterionIdList.Select(t => new TrialClinicalDataCriterion() + //{ + // TrialClinicalDataSetId = entity.Id, + // TrialReadingCriterionId = t + //}).ToList(); + + //if (indto.Id != null) + //{ + // await _trialClinicalDataCriterionRepository.BatchDeleteNoTrackingAsync(t => t.TrialClinicalDataSetId == entity.Id); + + // await _trialClinicalDataCriterionRepository.AddRangeAsync(entity.TrialClinicalDataCriterionList); + //} + - if (indto.Id != null) - { - await _trialClinicalDataCriterionRepository.BatchDeleteNoTrackingAsync(t => t.TrialClinicalDataSetId == entity.Id); - await _trialClinicalDataCriterionRepository.AddRangeAsync(entity.TrialClinicalDataCriterionList); - } await _clinicalDataTrialSetRepository.SaveChangesAsync(); return ResponseOutput.Ok(entity.Id.ToString()); } @@ -163,6 +170,7 @@ namespace IRaCIS.Application.Services public async Task> GetTrialClinicalDataTrialSetList(GetTrialClinicalDataTrialIndto inDto) { await this.AddTrialClinicalDataTrialSet(inDto.TrialId); + var trialClinicalDataList = await _clinicalDataTrialSetRepository.AsQueryable() .Where(x => x.TrialId == inDto.TrialId) .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel) @@ -190,40 +198,40 @@ namespace IRaCIS.Application.Services #endregion - #region 系统和项目标准下拉 界面上配置和临床数据关联 + #region 系统和项目标准下拉 界面上配置和临床数据关联 废弃 - [HttpPost] - public async Task> GetSystemCriterionSelectList(SystemCriterionSelectQuery inQuery) - { - return await _repository.Where() - .WhereIf(!string.IsNullOrEmpty(inQuery.CriterionName), t => t.CriterionName.Contains(inQuery.CriterionName)) - .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) - .WhereIf(inQuery.IsCompleteConfig != null, t => t.IsCompleteConfig == inQuery.IsCompleteConfig) - .Select(t => new SystemCriterionSelectDto() - { - Id = t.Id, - CriterionName = t.CriterionName, - IsCompleteConfig = t.IsCompleteConfig, - IsEnable = t.IsEnable - }).ToListAsync(); - } + //[HttpPost] + //public async Task> GetSystemCriterionSelectList(SystemCriterionSelectQuery inQuery) + //{ + // return await _repository.Where() + // .WhereIf(!string.IsNullOrEmpty(inQuery.CriterionName), t => t.CriterionName.Contains(inQuery.CriterionName)) + // .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) + // .WhereIf(inQuery.IsCompleteConfig != null, t => t.IsCompleteConfig == inQuery.IsCompleteConfig) + // .Select(t => new SystemCriterionSelectDto() + // { + // Id = t.Id, + // CriterionName = t.CriterionName, + // IsCompleteConfig = t.IsCompleteConfig, + // IsEnable = t.IsEnable + // }).ToListAsync(); + //} - [HttpPost] - public async Task> GetTrialCriterionSelectList(TrialCriterionSelectQuery inQuery) - { - return await _repository.Where(t => t.TrialId == inQuery.TrialId) - .WhereIf(!string.IsNullOrEmpty(inQuery.CriterionName), t => t.CriterionName.Contains(inQuery.CriterionName)) - .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) - .WhereIf(inQuery.IsCompleteConfig != null, t => t.IsCompleteConfig == inQuery.IsCompleteConfig) - .Select(t => new TrialCriterionSelectDto() - { - Id = t.Id, - CriterionName = t.CriterionName, - IsCompleteConfig = t.IsCompleteConfig, - IsEnable = t.IsEnable - }).ToListAsync(); - } + //[HttpPost] + //public async Task> GetTrialCriterionSelectList(TrialCriterionSelectQuery inQuery) + //{ + // return await _repository.Where(t => t.TrialId == inQuery.TrialId) + // .WhereIf(!string.IsNullOrEmpty(inQuery.CriterionName), t => t.CriterionName.Contains(inQuery.CriterionName)) + // .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) + // .WhereIf(inQuery.IsCompleteConfig != null, t => t.IsCompleteConfig == inQuery.IsCompleteConfig) + // .Select(t => new TrialCriterionSelectDto() + // { + // Id = t.Id, + // CriterionName = t.CriterionName, + // IsCompleteConfig = t.IsCompleteConfig, + // IsEnable = t.IsEnable + // }).ToListAsync(); + //} #endregion @@ -240,10 +248,13 @@ namespace IRaCIS.Application.Services private async Task AddTrialClinicalDataTrialSet(Guid trialId) { - var syncClinicalDataTime = await _trialRepository.Where(x => x.Id == trialId).Select(x => x.SyncClinicalDataTime).FirstOrDefaultAsync(); - if (syncClinicalDataTime == null) + + #region MyRegion + + + if (!await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null)) { - var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().Include(t=>t.SystemClinicalDataCriterionList).ToListAsync(); + var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable()/*.Include(t => t.SystemClinicalDataCriterionList)*/.ToListAsync(); var systemIds = systemClinicalDataList.Select(x => x.Id).ToList(); var trialSystemClinicalDataSetIds = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync(); @@ -252,7 +263,7 @@ namespace IRaCIS.Application.Services var systemDataList = systemClinicalDataList.Where(x => needAddids.Contains(x.Id)).ToList(); - var readingCriterionList = _repository.Where(t => t.TrialId == trialId).Where(t=>t.ReadingQuestionCriterionSystemId!=null) + var readingCriterionList = _repository.Where(t => t.TrialId == trialId).Where(t => t.ReadingQuestionCriterionSystemId != null) .Select(t => new { t.ReadingQuestionCriterionSystemId, TrialReadingCriterionId = t.Id }).ToList(); @@ -268,48 +279,99 @@ namespace IRaCIS.Application.Services Path = x.Path, TrialId = trialId, - TrialClinicalDataCriterionList = readingCriterionList.Where(t => x.SystemClinicalDataCriterionList.Select(c => (Guid?)c.SystemReadingCriterionId).ToList().Contains(t.ReadingQuestionCriterionSystemId)).Select(c => - new TrialClinicalDataCriterion() { TrialReadingCriterionId = c.TrialReadingCriterionId }).ToList() + CriterionEnumListStr=x.CriterionEnumListStr + + //TrialClinicalDataCriterionList = readingCriterionList.Where(t => x.SystemClinicalDataCriterionList.Select(c => (Guid?)c.SystemReadingCriterionId).ToList().Contains(t.ReadingQuestionCriterionSystemId)).Select(c => + //new TrialClinicalDataCriterion() { TrialReadingCriterionId = c.TrialReadingCriterionId }).ToList() }).ToList(); - #region 临床数据标准 - - - // dataSets.ForEach(x => - //x.TrialClinicalDataCriterionList = systemClinicalDataList.Where(t => t.Id == x.SystemClinicalDataSetId) - // .Select(t => new TrialClinicalDataCriterion() { TrialReadingCriterionId = x.cl }).ToList() - // ); - - #endregion - - await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets); - //var needUpdateitemList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && needUpdateIds.Contains(x.SystemClinicalDataSetId.Value)).ToListAsync(); - //foreach (var item in needUpdateitemList) - //{ - // var systemData = systemClinicalDataList.FirstOrDefault(x => x.Id == item.SystemClinicalDataSetId); - // await _clinicalDataTrialSetRepository.UpdatePartialNoQueryAsync(item.Id,x=>new ClinicalDataTrialSet() { - - // ClinicalDataSetName = systemData.ClinicalDataSetName, - // ClinicalDataLevel = systemData.ClinicalDataLevel, - // ClinicalUploadType = systemData.ClinicalUploadType, - // UploadRole = systemData.UploadRole, - // FileName = systemData.FileName, - // Path = systemData.Path, - // }); - //} - - await _trialRepository.BatchUpdateNoTrackingAsync(x => x.Id == trialId, x => new Trial() - { - SyncClinicalDataTime = DateTime.Now, - }); var result = await _clinicalDataTrialSetRepository.SaveChangesAsync(); } + #endregion + + + #region OLd + //var syncClinicalDataTime = await _trialRepository.Where(x => x.Id == trialId).Select(x => x.SyncClinicalDataTime).FirstOrDefaultAsync(); + //if (syncClinicalDataTime == null) + //{ + // var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().Include(t => t.SystemClinicalDataCriterionList).ToListAsync(); + // var systemIds = systemClinicalDataList.Select(x => x.Id).ToList(); + + // var trialSystemClinicalDataSetIds = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync(); + + // var needAddids = systemIds.Except(trialSystemClinicalDataSetIds).ToList(); + + // var systemDataList = systemClinicalDataList.Where(x => needAddids.Contains(x.Id)).ToList(); + + // var readingCriterionList = _repository.Where(t => t.TrialId == trialId).Where(t => t.ReadingQuestionCriterionSystemId != null) + // .Select(t => new { t.ReadingQuestionCriterionSystemId, TrialReadingCriterionId = t.Id }).ToList(); + + + // List dataSets = systemDataList.Select(x => new ClinicalDataTrialSet() + // { + // Id = NewId.NextGuid(), + // SystemClinicalDataSetId = x.Id, + // ClinicalDataSetName = x.ClinicalDataSetName, + // ClinicalDataLevel = x.ClinicalDataLevel, + // ClinicalUploadType = x.ClinicalUploadType, + // UploadRole = x.UploadRole, + // FileName = x.FileName, + // Path = x.Path, + // TrialId = trialId, + + // TrialClinicalDataCriterionList = readingCriterionList.Where(t => x.SystemClinicalDataCriterionList.Select(c => (Guid?)c.SystemReadingCriterionId).ToList().Contains(t.ReadingQuestionCriterionSystemId)).Select(c => + // new TrialClinicalDataCriterion() { TrialReadingCriterionId = c.TrialReadingCriterionId }).ToList() + // }).ToList(); + + + // #region 临床数据标准 + + + // // dataSets.ForEach(x => + // //x.TrialClinicalDataCriterionList = systemClinicalDataList.Where(t => t.Id == x.SystemClinicalDataSetId) + // // .Select(t => new TrialClinicalDataCriterion() { TrialReadingCriterionId = x.cl }).ToList() + // // ); + + // #endregion + + + + // await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets); + + // //var needUpdateitemList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && needUpdateIds.Contains(x.SystemClinicalDataSetId.Value)).ToListAsync(); + // //foreach (var item in needUpdateitemList) + // //{ + // // var systemData = systemClinicalDataList.FirstOrDefault(x => x.Id == item.SystemClinicalDataSetId); + // // await _clinicalDataTrialSetRepository.UpdatePartialNoQueryAsync(item.Id,x=>new ClinicalDataTrialSet() { + + // // ClinicalDataSetName = systemData.ClinicalDataSetName, + // // ClinicalDataLevel = systemData.ClinicalDataLevel, + // // ClinicalUploadType = systemData.ClinicalUploadType, + // // UploadRole = systemData.UploadRole, + // // FileName = systemData.FileName, + // // Path = systemData.Path, + // // }); + // //} + + // await _trialRepository.BatchUpdateNoTrackingAsync(x => x.Id == trialId, x => new Trial() + // { + // SyncClinicalDataTime = DateTime.Now, + // }); + + + // var result = await _clinicalDataTrialSetRepository.SaveChangesAsync(); + + //} + + #endregion + + } #endregion } diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index e7b09b1dd..b201d9e97 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -301,7 +301,9 @@ namespace IRaCIS.Application.Services List clinicalList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm) .WhereIf(inDto.UploadRole != null, x => x.UploadRole == inDto.UploadRole) .Where(x => !usedIdsQuery.Contains(x.Id)) - .WhereIf(inDto.TrialReadingCriterionId != null, t => t.TrialClinicalDataCriterionList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId)) + + //.WhereIf(inDto.TrialReadingCriterionId != null, t => t.TrialClinicalDataCriterionList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId)) + .WhereIf(inDto.IsVisit && inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataLevel == ClinicalLevel.SubjectVisit) .WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit) .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead || x.ClinicalDataLevel == ClinicalLevel.OncologyRead) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs index 84f1c9f16..f76254b8e 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs @@ -61,7 +61,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Path { get; set; } - public List TrialCriterionIdList { get; set; } + //public List TrialCriterionIdList { get; set; } + + public string CriterionEnumListStr { get; set; } = String.Empty; + + public List CriterionEnumList { get; set; } } public class ClinicalDataSystemSetAddOrEdit @@ -111,7 +115,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Path { get; set; } - public List SystemCriterionIdList { get; set; } + //public List SystemCriterionIdList { get; set; } + + + public string CriterionEnumListStr { get; set; } = String.Empty; + + public List CriterionEnumList { get; set; } } @@ -120,7 +129,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class ClinicalDataTrialSetView: ClinicalDataTrialSetAddOrEdit { - public List TrialCriterionNameList { get; set; } + //public List TrialCriterionNameList { get; set; } /// @@ -164,7 +173,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class ClinicalDataSystemSetView : ClinicalDataSystemSetAddOrEdit { - public List SystemCriterionNameList { get; set; } + //public List SystemCriterionNameList { get; set; } /// /// 创建时间 diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index 16660ef77..cb9c7b5d6 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -52,13 +52,13 @@ namespace IRaCIS.Core.Application.Service CreateMap().ReverseMap(); CreateMap() - .ForMember(t => t.TrialCriterionNameList, u => u.MapFrom(c => c.TrialClinicalDataCriterionList.Select(t => t.TrialReadingCriterion.CriterionName))) - .ForMember(t => t.TrialCriterionIdList, u => u.MapFrom(c => c.TrialClinicalDataCriterionList.Select(t => t.TrialReadingCriterion.Id))) + //.ForMember(t => t.TrialCriterionNameList, u => u.MapFrom(c => c.TrialClinicalDataCriterionList.Select(t => t.TrialReadingCriterion.CriterionName))) + //.ForMember(t => t.TrialCriterionIdList, u => u.MapFrom(c => c.TrialClinicalDataCriterionList.Select(t => t.TrialReadingCriterion.Id))) .ForMember(d => d.IsUsed, u => u.MapFrom(s => s.ReadingClinicalDataList.Count()>0)); - CreateMap() - .ForMember(t=>t.SystemCriterionNameList,u=>u.MapFrom(c=>c.SystemClinicalDataCriterionList.Select(t=>t.SystemReadingCriterion.CriterionName))) - .ForMember(t => t.SystemCriterionIdList, u => u.MapFrom(c => c.SystemClinicalDataCriterionList.Select(t => t.SystemReadingCriterion.Id))); + CreateMap(); + //.ForMember(t=>t.SystemCriterionNameList,u=>u.MapFrom(c=>c.SystemClinicalDataCriterionList.Select(t=>t.SystemReadingCriterion.CriterionName))) + //.ForMember(t => t.SystemCriterionIdList, u => u.MapFrom(c => c.SystemClinicalDataCriterionList.Select(t => t.SystemReadingCriterion.Id))); CreateMap().ReverseMap(); diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index 44c3b80a3..ab84708b8 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using System.Linq; namespace IRaCIS.Core.Domain.Models { @@ -66,7 +67,15 @@ namespace IRaCIS.Core.Domain.Models /// public string Path { get; set; } - public List SystemClinicalDataCriterionList { get; set; } = new List(); + public string CriterionEnumListStr { get; set; }=String.Empty; + + + + + [NotMapped] + public List CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(),out var s)).Select(t => int.Parse(t.Trim()) ).ToList(); + + //public List SystemClinicalDataCriterionList { get; set; } = new List(); } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs index 842e46160..05210c44c 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs @@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using System.Linq; namespace IRaCIS.Core.Domain.Models { @@ -83,7 +84,12 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("TrialId")] public Trial Trial { get; set; } - public List TrialClinicalDataCriterionList { get; set; } = new List(); + //public List TrialClinicalDataCriterionList { get; set; } = new List(); + + public string CriterionEnumListStr { get; set; } = String.Empty; + + [NotMapped] + public List CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(), out var s)).Select(t => int.Parse(t.Trim())).ToList(); }