修改一版

2022-06-27 11:37:23 +08:00
parent 61c4c4e789
commit 69436a2780
6 changed files with 86 additions and 4 deletions
@@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Service
        private readonly IRepository<Trial> _trialRepository;
        private readonly IEasyCachingProvider _provider;
        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
+        private readonly IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository;
        private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository;
        private readonly IRepository<SubjectUser> _subjectUserRepository;

@@ -36,12 +37,15 @@ namespace IRaCIS.Core.Application.Service


        public VisitTaskHelpeService(IRepository<VisitTask> visitTaskRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Trial> trialRepository, IEasyCachingProvider provider,
-            IRepository<SubjectVisit> subjectVisitRepository, IRepository<TaskAllocationRule> taskAllocationRuleRepository, IMapper mapper, IUserInfo userInfo, IRepository<VisitTaskReReading> visitTaskReReadingRepository)
+            IRepository<SubjectVisit> subjectVisitRepository,
+             IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
+            IRepository<TaskAllocationRule> taskAllocationRuleRepository, IMapper mapper, IUserInfo userInfo, IRepository<VisitTaskReReading> visitTaskReReadingRepository)
        {
            _visitTaskRepository = visitTaskRepository;
            _trialRepository = trialRepository;
            _provider = provider;
            _subjectVisitRepository = subjectVisitRepository;
+            this._readingJudgeInfoRepository = readingJudgeInfoRepository;
            _taskAllocationRuleRepository = taskAllocationRuleRepository;
            _subjectUserRepository = subjectUserRepository;
            _mapper = mapper;
@@ -382,6 +386,15 @@ namespace IRaCIS.Core.Application.Service
                    {
                        JudgeVisitTaskId = visitTask.Id
                    });
+
+                    await _readingJudgeInfoRepository.AddAsync(new ReadingJudgeInfo()
+                    {
+                        JudgeTaskId = visitTask.Id,
+                        SubjectId = firstTask.SubjectId,
+                        TrialId = firstTask.TrialId,
+                        TaskIdOne = generateTaskCommand.JudgeVisitTaskIdList[0],
+                        TaskIdTwo = generateTaskCommand.JudgeVisitTaskIdList[1]
+                    });
                    break;

                //case ReadingCategory.ReadingPeriod:
@@ -33,6 +33,7 @@ namespace IRaCIS.Application.Services
        private readonly IVisitTaskHelpeService _visitTaskHelpeService;
        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
        private readonly IRepository<Subject> _subjectRepository;
+        private readonly IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository;
        private readonly IRepository<ReadModule> _readModuleRepository;
        private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
        private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository;
@@ -47,6 +48,7 @@ namespace IRaCIS.Application.Services
                  IVisitTaskHelpeService visitTaskHelpeService,
                   IRepository<SubjectVisit> subjectVisitRepository,
                    IRepository<Subject> subjectRepository,
+                     IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
                     IRepository<ReadModule> readModuleRepository,
                 IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
                  IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
@@ -60,6 +62,7 @@ namespace IRaCIS.Application.Services
            this._visitTaskHelpeService = visitTaskHelpeService;
            this._subjectVisitRepository = subjectVisitRepository;
            this._subjectRepository = subjectRepository;
+            this._readingJudgeInfoRepository = readingJudgeInfoRepository;
            this._readModuleRepository = readModuleRepository;
            this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
            this._readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository;
@@ -260,8 +263,8 @@ namespace IRaCIS.Application.Services
        {

         var readingTaskState = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.ReadingTaskState).FirstOrDefaultAsync();
-         var query=  from data in _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId==inDto.ReadingQuestionCriterionTrialId )
-            join questionAnswer in _readingTaskQuestionAnswerRepository.Where(x=>x.VisitTaskId==inDto.VisitTaskId) on data.Id equals questionAnswer.ReadingQuestionTrialId into questionAnswerTemp
+         var query=  from data in _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId==inDto.ReadingQuestionCriterionTrialId)
+                     join questionAnswer in _readingTaskQuestionAnswerRepository.Where(x=>x.VisitTaskId==inDto.VisitTaskId) on data.Id equals questionAnswer.ReadingQuestionTrialId into questionAnswerTemp
                     from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty()
                     select new GetTrialReadingQuestionOutDto()
                     {
@@ -753,6 +756,8 @@ namespace IRaCIS.Application.Services
        {
            var trialId = await _visitTaskRepository.Where(x => inDto.VisitTaskIds.Contains(x.Id)).Select(x => x.TrialId).FirstOrDefaultAsync();

+         
+
            await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand()
            {
                JudgeVisitTaskIdList= inDto.VisitTaskIds,