From ec8b79326fa87eb7a4bd4c4fc3db7e8f235d2ce9 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 1 Aug 2022 11:33:24 +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      | 13 +++++++++----
 .../Reading/ReadingQuestionCriterionTrial.cs        | 10 ++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 1e3473697..bea8e4732 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -143,8 +143,12 @@ namespace IRaCIS.Application.Services
                 
             };
 
+            // 一致性分析按照doctorId 其他按照分组
+
             result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                 x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum&&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate&&x.TaskState==TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum)
+                 x.SubjectId == taskInfo.SubjectId &&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate&&x.TaskState==TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum)
+               .WhereIf(taskInfo.ArmEnum==Arm.GroupConsistentArm,x=>x.DoctorUserId== taskInfo.DoctorUserId)
+               .WhereIf(taskInfo.ArmEnum!= Arm.GroupConsistentArm, x => x.ArmEnum == taskInfo.ArmEnum)
                 .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
                 {
                     VisitName = x.SourceSubjectVisit.VisitName,
@@ -387,13 +391,13 @@ namespace IRaCIS.Application.Services
             }
 
 
-
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).FirstNotNullAsync();
 
             return (result, new
             {
                 VisitTaskId = task.VisitTaskId,
                 SubjectId = task.SubjectId,
-                SubjectCode = task.SubjectCode,
+                SubjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty()? task.SubjectCode: taskInfo.BlindSubjectCode,
                 ReadingCategory = task.ReadingCategory,
                 TaskBlindName = task.TaskBlindName,
                 IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
@@ -893,8 +897,9 @@ namespace IRaCIS.Application.Services
             x.Id != inDto.VisitTaskId && 
             x.ReadingTaskState == ReadingTaskState.HaveSigned&&
             x.TaskState==TaskState.Effect&&
-            x.ReadingCategory== taskInfo.ReadingCategory&&
             x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
+                .WhereIf(taskInfo.ReadingCategory==ReadingCategory.Visit,x=>x.ReadingCategory==ReadingCategory.Visit||x.ReadingCategory==ReadingCategory.Global)
+                .WhereIf(taskInfo.ReadingCategory != ReadingCategory.Visit,x=>x.ReadingCategory==taskInfo.ReadingCategory)
             .ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
             return readingPastResultList;
         }
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
index d1a8fa941..c81873101 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
@@ -71,6 +71,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public int? DigitPlaces { get; set; } = 2;
 
+		/// <summary>
+		/// 评估结果
+		/// </summary>
+		public string EvaluationResult { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 评估原因
+		/// </summary>
+		public string EvaluationReason { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 项目
 		/// </summary>