From 5cfe8c6596845f904bfb3e467456b85826f8936f Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 17 Oct 2022 09:26:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingCalculateViewModel.cs | 1 + .../Reading/Dto/ReadingClinicalDataDto.cs | 32 ------------------ .../Reading/ReadingClinicalDataService.cs | 24 +++++++------- .../ClinicalData/ReadingClinicalDataPDF.cs | 33 ------------------- 4 files changed, 13 insertions(+), 77 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs index 682bb7b62..4843f37d0 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs @@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public Guid VisitTaskId { get; set; } + public bool IsChangeOtherTask { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 46800cb40..0ceff40cd 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -214,20 +214,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public Guid? Id { get; set; } - /// - /// 项目ID - /// - public Guid TrialId { get; set; } - - /// - /// 对象ID - /// - public Guid ReadingId { get; set; } - - /// - /// 受试者ID - /// - public Guid SubjectId { get; set; } /// /// 阅片临床数据ID @@ -257,20 +243,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? Id { get; set; } - /// - /// 项目ID - /// - public Guid TrialId { get; set; } - /// - /// 对象ID - /// - public Guid ReadingId { get; set; } - - /// - /// 受试者ID - /// - public Guid SubjectId { get; set; } /// /// 阅片临床数据ID @@ -291,11 +264,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 是否为访视 /// public bool IsVisit { get; set; } - - /// - /// 临床级别 - /// - public ClinicalLevel ClinicalDataLevel { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index b83d5843c..5cbcc56e7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -87,14 +87,14 @@ namespace IRaCIS.Application.Services var entity = _mapper.Map(indto); entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() { - TrialId = entity.TrialId, - SubjectId = indto.SubjectId, + //TrialId = entity.TrialId, + //SubjectId = indto.SubjectId, FileName = x.FileName, Path = x.Path, - ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId, - IsVisit = indto.IsVisit, - ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel, - ReadingId = indto.ReadingId + //ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId, + //IsVisit = indto.IsVisit, + //ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel, + //ReadingId = indto.ReadingId }).ToList(); entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded; @@ -113,14 +113,14 @@ namespace IRaCIS.Application.Services var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() { - TrialId = entity.TrialId, - SubjectId = indto.SubjectId, + //TrialId = entity.TrialId, + //SubjectId = indto.SubjectId, FileName = x.FileName, Path = x.Path, - ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId, - IsVisit = indto.IsVisit, - ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel, - ReadingId = indto.ReadingId, + //ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId, + //IsVisit = indto.IsVisit, + //ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel, + //ReadingId = indto.ReadingId, ReadingClinicalDataId = entity.Id, }).ToList(); await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList); diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index 39a91c072..5a15b823e 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -13,21 +13,6 @@ namespace IRaCIS.Core.Domain.Models [Table("ReadingClinicalDataPDF")] public class ReadingClinicalDataPDF : Entity, IAuditAdd { - /// - /// 项目ID - /// - public Guid TrialId { get; set; } - - /// - /// 对象ID - /// - public Guid ReadingId { get; set; } - - /// - /// 受试者ID - /// - public Guid SubjectId { get; set; } - /// /// 阅片临床数据ID /// @@ -45,15 +30,6 @@ namespace IRaCIS.Core.Domain.Models [Required] public string FileName { get; set; } - /// - /// 是否为访视 - /// - public bool IsVisit { get; set; } - - /// - /// 临床级别 - /// - public ClinicalLevel ClinicalDataLevel { get; set; } /// /// 创建时间 @@ -65,15 +41,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid CreateUserId { get; set; } - - /// - /// 项目模板Id - /// - public Guid ClinicalDataTrialSetId { get; set; } - - - - [ForeignKey("ReadingClinicalDataId")] public ReadingClinicalData ReadingClinicalData { get; set; }