修改一版

2022-07-07 14:28:32 +08:00
parent d24e2be3bf
commit e85a397148
6 changed files with 43 additions and 3 deletions
@@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// <summary>
        /// 是否申请重阅
        /// </summary>
-        public bool IsApplyHeavyReading { get; set; } = false;
+        public bool? IsApplyHeavyReading { get; set; }


        /// <summary>
@@ -217,7 +217,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// <summary>
        /// 是否申请重阅
        /// </summary>
-        public bool IsApplyHeavyReading { get; set; } = false;
+        public bool? IsApplyHeavyReading { get; set; }
    }

    public class SaveMedicineQuestionInDto
@@ -156,6 +156,12 @@ namespace IRaCIS.Application.Services
            {
                task.SubjectCode = await _subjectRepository.Where(x => x.Id == task.SubjectId).Select(x => x.Code).FirstOrDefaultAsync();
            }
+
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == task.VisitTaskId && x.FirstReadingTime == null, x => new VisitTask()
+            {
+                FirstReadingTime = DateTime.Now,
+            });
+            await _visitTaskRepository.SaveChangesAsync();
            return task;


@@ -98,6 +98,17 @@ namespace IRaCIS.Core.Application.Service
                               JudgeVisitTaskId=x.JudgeVisitTaskId,
                               JudgeResultArm=x.JudgeResultTask.ArmEnum,
                               SubjectId=x.SubjectId,
+                               JudgeInfoList= x.ArmEnum== Arm.JudgeArm? x.JudgeResultTask.ReadingTaskQuestionAnswerList.Where(y=>y.ReadingQuestionTrial.IsJudgeQuestion).Select(y=> new JudgeInfo()
+                               {
+                                   Answer=y.Answer,
+                                   QuestionName=y.ReadingQuestionTrial.QuestionName,
+
+                               }).ToList() : x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeInfo()
+                               {
+                                   Answer = y.Answer,
+                                   QuestionName = y.ReadingQuestionTrial.QuestionName,
+
+                               }).ToList()
                           }).ToListAsync();

                List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId
@@ -133,6 +144,17 @@ namespace IRaCIS.Core.Application.Service
                    SouceReadModuleId = x.SouceReadModuleId,
                    SourceSubjectVisitId = x.SourceSubjectVisitId,
                    SubjectId = x.SubjectId,
+                    JudgeInfoList = x.ArmEnum == Arm.JudgeArm ? x.JudgeResultTask.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeInfo()
+                    {
+                        Answer = y.Answer,
+                        QuestionName = y.ReadingQuestionTrial.QuestionName,
+
+                    }).ToList() : x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeInfo()
+                    {
+                        Answer = y.Answer,
+                        QuestionName = y.ReadingQuestionTrial.QuestionName,
+
+                    }).ToList()
                }).ToListAsync();


@@ -462,5 +484,9 @@ namespace IRaCIS.Core.Application.Service
        }


+
+
+
+
    }
 }