From 4d2890976a6a377caff8f2a20deb846d480968bd Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 29 Apr 2024 13:08:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 4 +++- .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index f4f835247..fef53e520 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1901,7 +1901,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid VisitTaskId { get; set; } public string TaskName { get; set; } - public string TaskBlindName { get; set; } + public string VisitBlindName { get; set; } + + public string TaskBlindName { get; set; } public string VisitName { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 5dfa15cdb..0529a2317 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -693,7 +693,7 @@ namespace IRaCIS.Application.Services TaskBlindName = x.TaskBlindName, TaskName = x.TaskName, VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName, - + VisitBlindName = x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName :string.Empty, VisitTaskNum = x.VisitTaskNum, JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum, From c6ed8b8318e8eec6a0d2443a0a3db74e2ea17463 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 29 Apr 2024 14:39:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 0529a2317..0608351cc 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -693,7 +693,7 @@ namespace IRaCIS.Application.Services TaskBlindName = x.TaskBlindName, TaskName = x.TaskName, VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName, - VisitBlindName = x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName :string.Empty, + VisitBlindName = x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName : x.ReadModule.SubjectVisit.BlindName, VisitTaskNum = x.VisitTaskNum, JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum, From 87adbe9bedf092cf3f7eaeff94090807a6b962fd Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 29 Apr 2024 14:43:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 0608351cc..8ee8daf74 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -693,7 +693,7 @@ namespace IRaCIS.Application.Services TaskBlindName = x.TaskBlindName, TaskName = x.TaskName, VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName, - VisitBlindName = x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName : x.ReadModule.SubjectVisit.BlindName, + VisitBlindName = x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName : x.ReadModule!=null? x.ReadModule.SubjectVisit.BlindName:string.Empty, VisitTaskNum = x.VisitTaskNum, JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum, From 64c97b22d508f4fddd7f604e4af063d891884865 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 29 Apr 2024 14:43:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 8ee8daf74..ebf4919e9 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -689,6 +689,7 @@ namespace IRaCIS.Application.Services var readingPastResultList = await taskQuery.OrderBy(x => x.VisitTaskNum).ThenBy(x => x.TaskState).Select(x => new GetReadingPastResultListOutDto() { + VisitTaskId = x.Id, TaskBlindName = x.TaskBlindName, TaskName = x.TaskName, From 5b92015c9862e793ee529e5814cbdaa530607cc1 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 29 Apr 2024 15:07:29 +0800 Subject: [PATCH 5/7] =?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/ReadingImageTaskViewModel.cs | 4 +++- .../ReadingImageTask/ReadingImageTaskService.cs | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index fef53e520..c380370d2 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1899,7 +1899,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetReadingPastResultListOutDto { public Guid VisitTaskId { get; set; } - public string TaskName { get; set; } + + public Guid? ReadModuleVisitId { get; set; } + public string TaskName { get; set; } public string VisitBlindName { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index ebf4919e9..9e8cfe616 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -693,12 +693,26 @@ namespace IRaCIS.Application.Services VisitTaskId = x.Id, TaskBlindName = x.TaskBlindName, TaskName = x.TaskName, + ReadModuleVisitId= x.ReadModule!=null?x.ReadModule.SubjectVisitId:null, VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName, - VisitBlindName = x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName : x.ReadModule!=null? x.ReadModule.SubjectVisit.BlindName:string.Empty, + VisitBlindName = x.TaskBlindName, VisitTaskNum = x.VisitTaskNum, JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum, }).ToListAsync(); + + + foreach (var item in readingPastResultList) + { + if (item.ReadModuleVisitId != null) + { + item.VisitBlindName = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == item.ReadModuleVisitId && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && + x.IsAnalysisCreate == taskInfo.IsAnalysisCreate ).Select(x => x.TaskBlindName).FirstOrDefaultAsync(); + + } + } + + return readingPastResultList; } From 65545dd3e5a9f4fc2d9779a3a5a490c16d42a9bb Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 29 Apr 2024 15:09:32 +0800 Subject: [PATCH 6/7] =?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/ReadingImageTask/ReadingImageTaskService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 9e8cfe616..a8aec027b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -706,8 +706,8 @@ namespace IRaCIS.Application.Services { if (item.ReadModuleVisitId != null) { - item.VisitBlindName = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == item.ReadModuleVisitId && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && - x.IsAnalysisCreate == taskInfo.IsAnalysisCreate ).Select(x => x.TaskBlindName).FirstOrDefaultAsync(); + item.VisitBlindName = (await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == item.ReadModuleVisitId && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && + x.IsAnalysisCreate == taskInfo.IsAnalysisCreate ).Select(x => x.TaskBlindName).FirstOrDefaultAsync())??string.Empty; } } From 58eec48af7a6b4e2f51611c4c14229767aebe11b Mon Sep 17 00:00:00 2001 From: XCKJ Date: Thu, 2 May 2024 12:18:54 +0000 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..8589e1b66 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +[![Build Status](https://drone.frp.extimaging.com/api/badges/XCKJ/irc-netcore-api/status.svg)](https://drone.frp.extimaging.com/XCKJ/irc-netcore-api) \ No newline at end of file