Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study

代码修改修改阅片状态
2024-01-03 16:47:51 +08:00 · 2024-01-03 16:47:49 +08:00
1 changed files with 9 additions and 6 deletions
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@ -704,7 +704,15 @@ namespace IRaCIS.Application.Services
        {
            //await AddDefaultValueToTask(inDto.VisitTaskId);
            var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-            var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id);
+            if (taskInfo.ReadingTaskState == ReadingTaskState.WaitReading)
+            {
+				await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
+				{
+					ReadingTaskState = ReadingTaskState.Reading,
+
+				});
+			}
+            var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify,inDto.GroupClassifyList);

            return (result, new
            {
@ -2092,11 +2100,6 @@ namespace IRaCIS.Application.Services

            }

-            await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
-            {
-                ReadingTaskState = ReadingTaskState.Reading,
-
-            });
            await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
            await this._readingCalculateService.CalculateTask(new CalculateTaskInDto()
            {
Author	SHA1	Message	Date
he	86562b39e3	Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study continuous-integration/drone/push Build is passing Details	2024-01-03 16:47:51 +08:00
he	86fe43aa93	代码修改修改阅片状态	2024-01-03 16:47:49 +08:00