From 6a1a56f0bc023a681928b3eb7cb77b85c0e324e9 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 11 Sep 2024 16:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/TrialQCQuestionService.cs       | 18 ++++++++++++++++++
 .../ReadingImageTaskService.cs                 |  3 ++-
 .../Service/WorkLoad/DoctorWorkloadService.cs  |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs
index 43be232ff..2094fb11d 100644
--- a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs
@@ -297,6 +297,24 @@ namespace IRaCIS.Core.Application.Contracts
 
             }
 
+
+            if (addOrEditTrialQCQuestionConfigure.ParentId != null)
+            {
+                var parentShowOrder = await _trialQcQuestionRepository.Where(x => x.Id == addOrEditTrialQCQuestionConfigure.ParentId).Select(x => x.ShowOrder).FirstOrDefaultAsync();
+                if(parentShowOrder< addOrEditTrialQCQuestionConfigure.ShowOrder)
+                {
+                    //---父问题的显示序号要比子问题的显示序号小，请确认。
+                    throw new BusinessValidationFailedException(_localizer["TrialConfig_InvalidParentQuestionId"]);
+                }
+            }
+
+            var child = await _trialQcQuestionRepository.FirstOrDefaultAsync(x => x.ParentId == addOrEditTrialQCQuestionConfigure.Id);
+            if (child != null && child.ShowOrder > addOrEditTrialQCQuestionConfigure.ShowOrder)
+            {
+                //---父问题的显示序号要比子问题的显示序号小，请确认。
+                throw new BusinessValidationFailedException(_localizer["TrialConfig_InvalidParentQuestionId"]);
+            }
+
             await VerifyIsQCConfirmedAsync(addOrEditTrialQCQuestionConfigure.TrialId);
 
             var entity = await _trialQcQuestionRepository.InsertOrUpdateAsync(addOrEditTrialQCQuestionConfigure, true);
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 4deb47f3d..26060a5a3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -3287,10 +3287,11 @@ namespace IRaCIS.Application.Services
                                 x.SubjectId == taskInfo.SubjectId &&
                                 x.ReadingCategory == ReadingCategory.Visit &&
                                 x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
-                                x.ReadingTaskState == ReadingTaskState.HaveSigned &&
+                                //x.ReadingTaskState == ReadingTaskState.HaveSigned &&
                                 x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
                                 x.ArmEnum == taskInfo.ArmEnum &&
                                 x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
+                                x.BlindSubjectCode==taskInfo.BlindSubjectCode &&
                                 x.DoctorUserId == taskInfo.DoctorUserId &&
                                 x.TaskState == TaskState.Effect && x.Id != taskInfo.Id).Select(x => x.Id).ToListAsync();
 
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
index 3cd4da0a8..d22694297 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
@@ -138,7 +138,7 @@ namespace IRaCIS.Application.Services
                 if (readingCategoryList.Except(inDto.ReadingCategorys).Count() > 0)
                 {
                     //---已分配任务，不允许减少阅片类型
-                    //return ResponseOutput.NotOk(_localizer["DoctorWorkload_AssignType"]);
+                    return ResponseOutput.NotOk(_localizer["DoctorWorkload_AssignType"]);
 
                 }