diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 4a248f2ea..abf3b9286 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -33,7 +33,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsVisit { get; set; } } - public class GetTrialClinicalData - { - } + public class GetTrialClinicalDataSelectIndto + { + public int MyProperty { get; set; } + } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index 7d9864c1d..c0254a444 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -13,7 +13,7 @@ using MassTransit; namespace IRaCIS.Application.Services { /// - /// 临床数据配置 + /// 阅片临床数据配置 /// [ApiExplorerSettings(GroupName = "Reading")] public class ClinicalDataSetService : BaseService @@ -39,7 +39,24 @@ namespace IRaCIS.Application.Services return ResponseOutput.Ok(entity.Id.ToString()); } - + + + + /// + /// 删除 + /// + /// + /// + [HttpDelete("{id:guid}")] + public async Task ReadingClinicalData(Guid id) + { + await _readingClinicalDataRepository.DeleteFromQueryAsync(x => x.Id == id, true); + return ResponseOutput.Result(true); + } + + + //public async Task<> GetTrialClinicalDataSelect() + //public async Task> GetTrialClinicalData() ///// @@ -78,7 +95,7 @@ namespace IRaCIS.Application.Services //} - + ///// ///// 将系统配置添加到项目配置 @@ -100,7 +117,7 @@ namespace IRaCIS.Application.Services // ClinicalDataLevel=x.ClinicalDataLevel, // ClinicalUploadType=x.ClinicalUploadType, // TrialId= trialId, - + // }).ToList(); // await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets); // var result= await _clinicalDataTrialSetRepository.SaveChangesAsync(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index fbe94a2f2..cb94921e7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -16,6 +16,10 @@ namespace IRaCIS.Core.Application.Contracts /// public string SubjectCodeRule { get; set; } = string.Empty; + + + public List ClinicalDataTrialSetIds { get; set; } = new List(); + public bool IsSubjectSecondCodeView { get; set; } /// @@ -76,7 +80,6 @@ namespace IRaCIS.Core.Application.Contracts public List CriterionIds { get; set; } = new List(); - public List ClinicalDataTrialSetIds { get; set; } = new List(); public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 379ee44f4..955927d5b 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -161,6 +161,24 @@ namespace IRaCIS.Core.Application _mapper.Map(trialConfig, trialInfo); trialInfo.UpdateTime = DateTime.Now; + + var noconfirmids = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialConfig.TrialId && !trialConfig.ClinicalDataTrialSetIds.Contains(x.Id)).Select(x => x.Id).ToListAsync(); + foreach (var item in trialConfig.ClinicalDataTrialSetIds) + { + await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet() + { + IsConfirm = true + }); + } + + foreach (var item in noconfirmids) + { + await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet() + { + IsConfirm = false + }); + } + return ResponseOutput.Ok(await _repository.SaveChangesAsync()); } @@ -314,22 +332,7 @@ namespace IRaCIS.Core.Application - var noconfirmids = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialConfig.TrialId && !trialConfig.ClinicalDataTrialSetIds.Contains(x.Id)).Select(x => x.Id).ToListAsync(); - foreach (var item in trialConfig.ClinicalDataTrialSetIds) - { - await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet() - { - IsConfirm = true - }); - } - - foreach (var item in noconfirmids) - { - await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet() - { - IsConfirm = false - }); - } +