From 03c2a67fe4548e737710638e897ada54f56851ff Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 5 Aug 2024 14:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskHelpeService.cs | 7 ++++--- IRaCIS.Core.Domain/Image/DicomStudy.cs | 6 ++++-- .../EntityConfigration/StudyConfigration.cs | 9 ++++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 4a3627320..d739000b2 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -1425,7 +1425,7 @@ namespace IRaCIS.Core.Application.Service var taskState = exsitPDF ? TaskState.NotEffect : TaskState.Effect; - var clinicalDataList = _readingClinicalDataRepository.Where(t => t.SubjectId == subjectId&&t.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF).Include(t => t.ReadingClinicalDataPDFList).Include(t=>t.ClinicalDataTrialSet).ToList(); + var clinicalDataList = _readingClinicalDataRepository.Where(t => t.SubjectId == subjectId && t.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF).Include(t => t.ReadingClinicalDataPDFList).Include(t => t.ClinicalDataTrialSet).ToList(); foreach (var clinicalData in clinicalDataList) { @@ -1433,13 +1433,14 @@ namespace IRaCIS.Core.Application.Service var id = NewId.NextSequentialGuid(); consistnentClinicalData.Id = id; - if(consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF) + if (consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF) { consistnentClinicalData.IsSign = false; consistnentClinicalData.IsBlind = false; consistnentClinicalData.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded; + consistnentClinicalData.ClinicalDataTrialSet = null; } - + var consistanClinicalDataPdfList = _mapper.Map>(clinicalData.ReadingClinicalDataPDFList); consistanClinicalDataPdfList.ForEach(t => { t.ReadingConsistentClinicalDataId = id; t.Id = Guid.Empty; }); diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index b0d6526b5..2fa295e25 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -89,10 +89,12 @@ namespace IRaCIS.Core.Domain.Models public List ReadingClinicalDataList { get; set; } + [JsonIgnore] + public List ReadingConsistentClinicalDataList { get; set; } - //软删除 - public bool IsDeleted { get; set; } + //软删除 + public bool IsDeleted { get; set; } public DateTime? DeletedTime { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/EntityConfigration/StudyConfigration.cs b/IRaCIS.Core.Infra.EFCore/EntityConfigration/StudyConfigration.cs index dfed9328a..c1b0133e8 100644 --- a/IRaCIS.Core.Infra.EFCore/EntityConfigration/StudyConfigration.cs +++ b/IRaCIS.Core.Infra.EFCore/EntityConfigration/StudyConfigration.cs @@ -19,6 +19,13 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration .HasForeignKey(s => new { s.StudyId }) .HasPrincipalKey(c => new { c.Id }); - } + + builder + .HasMany(s => s.ReadingConsistentClinicalDataList) + .WithOne(c => c.DicomStudy) + .HasForeignKey(s => new { s.StudyId }) + .HasPrincipalKey(c => new { c.Id }); + + } } }