修改一版

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -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:

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

@@ -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,

IRaCIS.Core.Domain/Reading/ReadingJudgeInfo.cs

@@ -0,0 +1,60 @@
+
+
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace IRaCIS.Core.Domain.Models
+{
+	 ///<summary>
+	 ///阅片裁判信息
+	 ///</summary>
+	 [Table("ReadingJudgeInfo")]	
+	 public class ReadingJudgeInfo : Entity, IAuditAdd
+	{
+		/// <summary>
+        /// 第一个任务ID
+        /// </summary>
+		[Required]
+		public Guid TaskIdOne { get; set; }
+	
+		/// <summary>
+        /// 第二个任务ID
+        /// </summary>
+		[Required]
+		public Guid TaskIdTwo { get; set; }
+	
+		/// <summary>
+        /// 裁判任务ID
+        /// </summary>
+		[Required]
+		public Guid JudgeTaskId { get; set; }
+	
+		/// <summary>
+        /// 创建时间
+        /// </summary>
+		[Required]
+		public DateTime CreateTime { get; set; }
+	
+		/// <summary>
+        /// 创建人
+        /// </summary>
+		[Required]
+		public Guid CreateUserId { get; set; }
+	
+		/// <summary>
+        /// 项目ID
+        /// </summary>
+		[Required]
+		public Guid TrialId { get; set; }
+
+		/// <summary>
+		/// 受试者ID
+		/// </summary>
+		[Required]
+		public Guid SubjectId { get; set; }
+
+	}
+
+	
+}	 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -198,6 +198,8 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public virtual DbSet<ReadingClinicalDataPDF> ReadingClinicalDataPDF { get; set; }
 
+        public virtual DbSet<ReadingJudgeInfo> ReadingJudgeInfo { get; set; }
+
         public virtual DbSet<ReadModule> ReadModule { get; set; }
 
         public virtual DbSet<ReadModuleView> ReadModuleView { get; set; }

IRaCIS.Core.Test/DbHelper.ttinclude

@@ -4,7 +4,7 @@
         public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
         public static readonly string DbDatabase = "IRaCIS_New_Tet";
         //表名称用字符串,拼接
-        public static readonly string TableName = "VisitTaskReReading";
+        public static readonly string TableName = "ReadingJudgeInfo";
         //具体文件里面  例如service 可以配置是否分页
 	}
 #>

IRaCIS.Core.Test/TT_Template/IRaCIS.Core.Entity.cs

@@ -1 +1,3 @@
 
+
+