Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

2024-08-22 09:30:58 +08:00
parent e5c35f7fab 0f45729c94
commit d58cd79d28
5 changed files with 64 additions and 5 deletions
@@ -1427,6 +1427,7 @@ namespace IRaCIS.Core.Application.Service
                case GenerateTaskCategory.SelfConsistent:

                    var readingCriterionId = generateTaskCommand.GenerataConsistentTaskList.First().TrialReadingCriterionId;
+                    var isReadingTaskViewInOrder = await _trialReadingCriterionRepository.Where(t => t.Id == readingCriterionId).Select(x => x.IsReadingTaskViewInOrder).FirstNotNullAsync();
                    var subjectId = generateTaskCommand.GenerataConsistentTaskList.First().SubjectId;
                    //var trialReadingCriterion=_trialReadingCriterionRepository.Where(t=>t.Id== trialReadingCriterionId).FirstOrDefault();

@@ -1469,7 +1470,11 @@ namespace IRaCIS.Core.Application.Service
                    foreach (var task in generateTaskCommand.GenerataConsistentTaskList)
                    {

-                        var exsitPDF = await _readingClinicalDataRepository.AnyAsync(t => t.TrialId == trialId &&
+                    
+
+                        var exsitPDF = await _readingClinicalDataRepository
+                            .WhereIf(isReadingTaskViewInOrder== ReadingOrder.Random,t=>t.ReadingId== task.SouceReadModuleId|| t.ReadingId == task.SourceSubjectVisitId)
+                            .AnyAsync(t => t.TrialId == trialId &&
                        t.SubjectId== task.SubjectId&&

                        t.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == readingCriterionId)