From 1057ade163417ab2395d9b306ba717cf4b8d64a3 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 6 Jul 2022 17:17:16 +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 --- .../Service/Reading/ReadingImageTaskService.cs | 4 ++-- .../Service/Reading/ReadingMedicalReviewService.cs | 6 ++++-- IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 8d4f28894..14e59e2eb 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -121,8 +121,8 @@ namespace IRaCIS.Application.Services VisitTaskId = x.Id, TaskBlindName=x.TaskBlindName, ReadingCategory = x.ReadingCategory, - VisistId = x.ReadModule != null ? x.ReadModule.SubjectVisitId : x.SourceSubjectVisit.Id, - VisitNum = x.ReadModule != null ? x.ReadModule.VisitNum : x.SourceSubjectVisit.VisitNum, + VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, + VisitNum = x.SourceSubjectVisitId != null ? x.SourceSubjectVisit.VisitNum : x.ReadModule.VisitNum, }).OrderBy(x => x.VisitNum).ThenBy(x => x.ReadingCategory); task =await taskquery.FirstOrDefaultAsync(); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs index c2f0b1a07..a242ea3af 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs @@ -237,7 +237,8 @@ namespace IRaCIS.Core.Application.Service await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview() { - SaveQuestionTime = DateTime.Now + SaveQuestionTime = DateTime.Now, + AuditState = MedicalReviewAuditState.Auditing, }); var result = await _readingMedicineQuestionAnswerRepository.SaveChangesAsync(); @@ -260,7 +261,8 @@ namespace IRaCIS.Core.Application.Service IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion, AuditAdviceEnum = inDto.AuditAdviceEnum, SaveConclusionTime=DateTime.Now, - + AuditState= MedicalReviewAuditState.Auditing, + }); var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync(); diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 1ce3bd332..06b8786da 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -97,10 +97,10 @@ namespace IRaCIS.Core.Infra.EFCore modelBuilder.Entity().HasMany(t => t.SubjectArmVisitTaskList).WithOne(t=>t.SujectArm).HasForeignKey(t => new { t.SubjectId,t.ArmEnum}).HasPrincipalKey(u => new { u.SubjectId,u.ArmEnum }); modelBuilder.Entity().HasMany(t => t.JudgeVisitList).WithOne(t=>t.JudgeVisitTask); - //modelBuilder.Entity().HasMany(t => t.SameVisitTaskList).WithOne().HasForeignKey(t=>t.SourceSubjectVisitId).HasPrincipalKey(u=>u.SourceSubjectVisitId); + modelBuilder.Entity().HasMany(t => t.SameVisitTaskList).WithOne().HasForeignKey(t => t.SourceSubjectVisitId); //modelBuilder.Entity().HasMany(t => t.AnalysisVisitTaskList).WithOne().HasForeignKey(t => t.TaskConsistentRuleId).HasPrincipalKey(u => u.SourceSubjectVisitId); - + modelBuilder.Entity().HasMany(t => t.ChildList).WithOne(t => t.Parent);