序号修改

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);

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();
 

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"]);
 
                 }