Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -666,7 +666,7 @@ namespace IRaCIS.Application.Services
         public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionTrial(ReadingTableQuestionTrialAddOrEdit indto)
         {
 
-
+            var list = await _readingTableQuestionTrialRepository.Where(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder && x.ReadingQuestionId == indto.ReadingQuestionId).ToListAsync();
             if (await _readingTableQuestionTrialRepository.AnyAsync(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder && x.ReadingQuestionId==indto.ReadingQuestionId))
             {
                 //---问题编号重复

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -2913,7 +2913,7 @@ namespace IRaCIS.Application.Services
                 task.SubjectCode = await _subjectRepository.Where(x => x.Id == task.SubjectId).Select(x => x.Code).FirstNotNullAsync();
             }
 
-            await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == task.VisitTaskId&&x.TaskState==TaskState.Effect&&x.ReadingTaskState!=ReadingTaskState.HaveSigned && x.FirstReadingTime == null, x => new VisitTask()
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == task.VisitTaskId&&x.TaskState==TaskState.Effect&&x.ReadingTaskState!=ReadingTaskState.HaveSigned , x => new VisitTask()
             {
                 FirstReadingTime = DateTime.Now,
             });

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -201,7 +201,8 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<ReadingTableQuestionTrial, ReadingTableQuestionTrialView>()
-                  .ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder));
+                  .ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder))
+                   .ForMember(d => d.CreateUser, u => u.Ignore());
             CreateMap<ReadingTableQuestionSystemAddOrEdit, ReadingTableQuestionSystem>();
 
             CreateMap<ReadingTableQuestionTrialAddOrEdit, ReadingTableQuestionTrial>();