修改一版

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs

@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class MedicineQuestionAnswer
     {
-        public Guid MedicineQuestionId { get; set; }
+        public Guid Id { get; set; }
 
 
         public string Answer { get; set; }
@@ -54,6 +54,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid VisitTaskId { get; set; }
 
+        public Arm ArmEnum { get; set; }
+
         public List<TaskInfo> TaskList { get; set; } = new List<TaskInfo>();
 
  
@@ -145,7 +147,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string Answer { get; set; }
 
-        public Guid MedicineQuestionId { get; set; }
+        public Guid Id { get; set; }
 
         /// <summary>
         /// 类型
@@ -231,6 +233,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? OtherTaskId { get; set; }
 
+        public Guid? JudgeVisitTaskId { get; set; }
+
+        public Guid? JudgeResultTaskId { get; set; }
+
+
+        public Arm? JudgeResultArm { get; set; }
+
     }
 
 }

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

@@ -65,6 +65,8 @@ namespace IRaCIS.Core.Application.Service
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReviewInfo.MedicalReviewInfo.VisitTaskId).FirstNotNullAsync();
 
             medicalReviewInfo.VisitTaskId = taskInfo.Id;
+            medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
+
             #region 取任务
             if (medicalReviewInfo.IsReadingTaskViewInOrder)
             {
@@ -83,6 +85,8 @@ namespace IRaCIS.Core.Application.Service
                                TaskName = x.TaskName,
                                SouceReadModuleId=x.SouceReadModuleId,
                                SourceSubjectVisitId=x.SourceSubjectVisitId,
+                               JudgeVisitTaskId=x.JudgeVisitTaskId,
+                               JudgeResultArm=x.JudgeResultTask.ArmEnum,
                            }).ToListAsync();
 
 
@@ -158,7 +162,7 @@ namespace IRaCIS.Core.Application.Service
                                 from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty()
                                 select new ReadingMedicineQuestion()
                                 {
-                                    MedicineQuestionId = data.Id,
+                                    Id = data.Id,
                                     Type = data.Type,
                                     ParentTriggerValue = data.ParentTriggerValue,
                                     IsEnable = data.IsEnable,
@@ -185,7 +189,7 @@ namespace IRaCIS.Core.Application.Service
 
         private void FindChildQuestion(ReadingMedicineQuestion medicineQuestionList, List<ReadingMedicineQuestion> questionlists)
         {
-            medicineQuestionList.Childrens = questionlists.Where(x => x.ParentId == medicineQuestionList.MedicineQuestionId).ToList();
+            medicineQuestionList.Childrens = questionlists.Where(x => x.ParentId == medicineQuestionList.Id).ToList();
             if (medicineQuestionList.Childrens != null && medicineQuestionList.Childrens.Count != 0)
             {
                 medicineQuestionList.Childrens.ForEach(x =>
@@ -210,7 +214,7 @@ namespace IRaCIS.Core.Application.Service
             List<ReadingMedicineQuestionAnswer> questionAnswerList = inDto.QuestionAnswerList.Select(x => new ReadingMedicineQuestionAnswer()
             {
                 Answer = x.Answer,
-                ReadingMedicineQuestionId = x.MedicineQuestionId,
+                ReadingMedicineQuestionId = x.Id,
                 TaskMedicalReviewId = inDto.TaskMedicalReviewId,
                 VisitTaskId = inDto.VisitTaskId,
 
@@ -218,6 +222,12 @@ namespace IRaCIS.Core.Application.Service
 
             await _readingMedicineQuestionAnswerRepository.AddRangeAsync(questionAnswerList);
 
+            await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
+            {
+
+                SaveQuestionTime = DateTime.Now
+            });
+
             var result = await _readingMedicineQuestionAnswerRepository.SaveChangesAsync();
 
            return  ResponseOutput.Result(result);

IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs

@@ -119,6 +119,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool IsClosed { get; set; }
 
+		/// <summary>
+		/// 保存问题的时间
+		/// </summary>
+		public DateTime? SaveQuestionTime { get; set; }
+
 
 	}
 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -122,6 +122,9 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public Guid? JudgeResultTaskId { get; set; }
 
+        [ForeignKey("JudgeResultTaskId")]
+        public VisitTask JudgeResultTask { get; set; }
+
         /// <summary>
         /// 裁判结果的备注
         /// </summary>