From 450d6e1828b12927269a281955d05365b6fca652 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 9 Jun 2022 14:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/UploadDownLoadController.cs | 6 +- .../Service/Reading/ClinicalDataService.cs | 107 ------------------ .../Service/Reading/ClinicalDataSetService.cs | 14 +-- .../Dto/ClinicalDataServiceViewModel.cs | 14 +-- .../Reading/ReadingPeriodSetService.cs | 2 +- .../Service/Reading/_MapConfig.cs | 5 - .../TrialSiteUser/TrialConfigService.cs | 5 + .../Service/TrialSiteUser/_MapConfig.cs | 2 +- IRaCIS.Core.Domain/Reading/ClinicalData.cs | 65 ----------- .../Reading/ClinicalDataTrialSet.cs | 5 + .../Reading/ReadingClinicalData.cs | 42 +++++++ .../Context/IRaCISDBContext.cs | 3 - 12 files changed, 66 insertions(+), 204 deletions(-) delete mode 100644 IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs delete mode 100644 IRaCIS.Core.Domain/Reading/ClinicalData.cs create mode 100644 IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index ae5b96efb..1bf3eb368 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -208,19 +208,19 @@ namespace IRaCIS.Core.API.Controllers public IMapper _mapper { get; set; } public IUserInfo _userInfo { get; set; } private readonly IMediator _mediator; - private readonly IRepository _clinicalDataRepository; + private readonly IWebHostEnvironment _hostEnvironment; private readonly IRepository _repository; public StudyController(IMapper mapper, IUserInfo userInfo, IWebHostEnvironment hostEnvironment, IMediator mediator, - IRepository clinicalDataRepository, + IRepository repository) { _hostEnvironment = hostEnvironment; _mediator = mediator; - this._clinicalDataRepository = clinicalDataRepository; + _mapper = mapper; _userInfo = userInfo; _repository = repository; diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs deleted file mode 100644 index 00aea4d2f..000000000 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs +++ /dev/null @@ -1,107 +0,0 @@ -//using IRaCIS.Application.Interfaces; -//using IRaCIS.Core.Infra.EFCore; -//using IRaCIS.Core.Domain.Share; -//using IRaCIS.Core.Application.Filter; -//using Microsoft.AspNetCore.Mvc; -//using IRaCIS.Core.Application.Service.WorkLoad.DTO; -//using Microsoft.AspNetCore.Authorization; -//using IRaCIS.Core.Application.Auth; -//using IRaCIS.Core.Application.Service.Reading.Dto; -//using IRaCIS.Core.Domain.Share.Reading; - -//namespace IRaCIS.Application.Services -//{ -// /// -// /// 临床数据 -// /// -// [ApiExplorerSettings(GroupName = "Reading")] -// public class ClinicalDataService : BaseService -// { - -// public IRepository _subjectVisitRepository; -// private readonly IRepository _clinicalDataRepository; -// private readonly IRepository _previousPDFRepository; - -// public ClinicalDataService(IRepository subjectVisitRepository, -// IRepository clinicalDataRepository, -// IRepository previousPDFRepository -// ) -// { -// _subjectVisitRepository = subjectVisitRepository; -// _clinicalDataRepository = clinicalDataRepository; -// this._previousPDFRepository = previousPDFRepository; -// } - - -// /// -// /// 新增或者修改 -// /// -// /// -// /// -// [HttpPost] -// public async Task AddOrUpdateClinicalDataService(ClinicalDataAddOrEdit addOrEditClinicalData) -// { -// var entity = await _repository.InsertOrUpdateAsync(addOrEditClinicalData, true); -// return ResponseOutput.Ok(entity.Id.ToString()); -// } - -// /// -// /// 分页获取 -// /// -// /// -// /// -// [HttpPost] -// public async Task> GetClinicalDataList(ClinicalDataQuery query) -// { - -// var readquery = _clinicalDataRepository.AsQueryable() -// .WhereIf(query.TrialId!=null,x=>x.TrialId==query.TrialId) -// .ProjectTo(_mapper.ConfigurationProvider); -// var pageList= await readquery.ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField == null ? "CreateTime" : query.SortField, -// query.SortAsc); - -// return pageList; -// } - - - -// /// -// /// 获取 -// /// -// /// -// /// -// [HttpPost] -// public async Task ClinicalDataView(ClinicalDataInDto inDto) -// { -// var list= await _previousPDFRepository.AsQueryable().Where(x => x.TrialId == inDto.TrialId) -// .Where(x => (x.ClinicalLevel == ClinicalLevel.Subject && x.SubjectId == inDto.SubjectId) || x.SubjectVisitId == inDto.VisitOrReadId) -// .Select(x=>new { -// x.Path, -// x.DataType, -// x.CreateTime, -// x.ClinicalLevel, -// x.FileName, -// x.UploadType, -// x.Id, -// }) -// .ToListAsync(); -// return list; -// } - - - - - -// /// -// /// 删除 -// /// -// /// -// /// -// [HttpDelete("{ClinicalDataId:guid}")] -// public async Task DeleteClinicalData(Guid clinicalDataId) -// { -// var success = await _repository.BatchDeleteAsync(t => t.Id == clinicalDataId); -// return ResponseOutput.Result(success); -// } -// } -//} diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs index fec872293..648a71234 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs @@ -20,20 +20,20 @@ namespace IRaCIS.Application.Services { public IRepository _subjectVisitRepository; - private readonly IRepository _clinicalDataRepository; + private readonly IRepository _clinicalDataTrialSetRepository; private readonly IRepository _clinicalDataSystemSetRepository; private readonly IRepository _previousPDFRepository; public ClinicalDataSetService(IRepository subjectVisitRepository, - IRepository clinicalDataRepository, + IRepository ClinicalDataTrialSetRepository, IRepository ClinicalDataSystemSetRepository, IRepository previousPDFRepository ) { _subjectVisitRepository = subjectVisitRepository; - _clinicalDataRepository = clinicalDataRepository; + _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository; _clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository; this._previousPDFRepository = previousPDFRepository; @@ -118,10 +118,10 @@ namespace IRaCIS.Application.Services foreach (var item in nocheckids) { - await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet() - { - IsCheck = false - }); + await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet() + { + IsCheck = false + }); } await _clinicalDataTrialSetRepository.SaveChangesAsync(); diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs index 8d1ea27e1..be53ee3e3 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs @@ -7,11 +7,7 @@ using System.Threading.Tasks; namespace IRaCIS.Core.Application.Service.Reading.Dto { - public class ClinicalDataAddOrEdit : ClinicalData - { - public new Guid? Id { get; set; } - - } + public class ClinicalDataTrialSetAddOrEdit : ClinicalDataSystemSetAddOrEdit { @@ -30,9 +26,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public Guid? Id { get; set; } - - - /// /// 名称 /// @@ -57,10 +50,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto } - public class ClinicalDataView : ClinicalData - { - - } + public class ClinicalDataTrialSetView : ClinicalDataSystemSetView { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index d2f779689..c3efedca0 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -109,7 +109,7 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task> GetPreviewTheReadingList(PreviewTheReadingListInDto inDto) { - var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId && x.InPlan&&x.LatestScanDate!=null) + var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId &&x.LatestScanDate!=null) .WhereIf(inDto.SiteIds.Count != 0, x => inDto.SiteIds.Contains(x.SiteId)); var existsBubjectVisitsQuery= _readModuleRepository.Where(y => y.ReadingSetType == inDto.ReadingSetType && y.TrialId == inDto.TrialId).Select(x => x.SubjectVisitId); visitQuery = visitQuery.Where(x => !existsBubjectVisitsQuery.Contains(x.Id)) diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index 4bfc87029..fdc45c5f2 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -23,11 +23,6 @@ namespace IRaCIS.Core.Application.Service //.ForMember(d => d.SiteNames, u => u.MapFrom(s => s.ReadingPeriodSites.SelectMany(x => x.Site.SiteName).ToList())); - CreateMap().ReverseMap(); - - - - CreateMap(); CreateMap().ReverseMap(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 574f42102..4491bf44e 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -16,15 +16,18 @@ namespace IRaCIS.Core.Application { private readonly IRepository _trialRepository; private readonly IRepository _trialQCQuestionRepository; + private readonly IRepository _clinicalDataTrialSetRepository; private readonly IEasyCachingProvider _provider; public TrialConfigService(IRepository trialRepository, IRepository trialQCQuestionRepository, + IRepository clinicalDataTrialSetRepository, IEasyCachingProvider provider ) { _trialRepository = trialRepository; this._trialQCQuestionRepository = trialQCQuestionRepository; + this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository; this._provider = provider; } @@ -308,6 +311,8 @@ namespace IRaCIS.Core.Application _mapper.Map(trialConfig, trialInfo); trialInfo.UpdateTime = DateTime.Now; + //__clinicalDataTrialSetRepository.up + return ResponseOutput.Ok(await _repository.SaveChangesAsync()); } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index 9388e9c77..e7f7b73d8 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.Service CreateMap(); CreateMap().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id)) - .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsCheck).Select(r => r.ClinicalDataSetName))) + .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsCheck&&v.IsConfirm).Select(r => r.ClinicalDataSetName))) .ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId))); CreateMap(); CreateMap(); diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData.cs deleted file mode 100644 index 019efb8ef..000000000 --- a/IRaCIS.Core.Domain/Reading/ClinicalData.cs +++ /dev/null @@ -1,65 +0,0 @@ - - -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using IRaCIS.Core.Domain.Share.Reading; - -namespace IRaCIS.Core.Domain.Models -{ - /// - /// 临床资料 - /// - [Table("ClinicalData")] - public class ClinicalData : Entity, IAuditAdd - { - - /// - /// 项目ID - /// - public Guid? TrialId { get; set; } - - /// - /// 受试者ID - /// - public Guid? SubjectId { get; set; } - - /// - /// 访视或者阅片ID - /// - public Guid? VisitOrReadId { get; set; } - - /// - /// 临床级别 - /// - public ClinicalLevel? ClinicalLevel { get; set; } - - /// - /// 数据类型 - /// - public ClinicalDataType? DataType { get; set; } - - /// - /// 上传方式 - /// - public ClinicalUploadType? UploadType { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } - - } - - - - - - -} diff --git a/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs index 7de81f08d..616124bda 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs @@ -58,6 +58,11 @@ namespace IRaCIS.Core.Domain.Models public bool IsCheck { get; set; } + /// + /// 是否确认 + /// + public bool IsConfirm { get; set; } + [ForeignKey("TrialId")] public Trial Trial { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs new file mode 100644 index 000000000..ca10210f7 --- /dev/null +++ b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs @@ -0,0 +1,42 @@ + + +using System; +using IRaCIS.Core.Domain.Share; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using IRaCIS.Core.Domain.Share.Reading; + +namespace IRaCIS.Core.Domain.Models +{ + /// + /// 项目的临床数据 + /// + [Table("ReadingClinicalData")] + public class ReadingClinicalData : Entity, IAuditAdd + { + /// + /// 项目ID + /// + public Guid TrialId { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 创建人 + /// + public Guid CreateUserId { get; set; } + + + + + } + + + + + + +} diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 4ad567da3..95cb745cf 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -186,9 +186,6 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet ClinicalDataTrialSet { get; set; } public virtual DbSet ClinicalDataSystemSet { get; set; } - - public virtual DbSet ClinicalData { get; set; } - #endregion