Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

2023-03-24 14:27:12 +08:00
parent 3f3a9093b2 638de8c386
commit c9f7a2b3f7
5 changed files with 13 additions and 5 deletions
@@ -11,7 +11,7 @@ using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.ViewModel
 {
    /// <summary> SubjectCriteriaEvaluationView  列表视图模型 </summary>
-    public class SubjectCriteriaEvaluationView 
+    public class SubjectCriteriaEvaluationView
    {
        public Guid? Id { get; set; }
        public Guid SubjectId { get; set; }
@@ -25,17 +25,17 @@ namespace IRaCIS.Core.Application.ViewModel

        public bool? IsImageFiltering { get; set; }

-        public  bool? IsJoinEvaluation { get; set; }
+        public bool? IsJoinEvaluation { get; set; }

        public string SubjectCode { get; set; }

        public string TrialSiteCode { get; set; }
        public SubjectStatus SubjectStatus { get; set; }

-        public List<EvaluationInfo> FinalEvaluationList { get; set; }=new List<EvaluationInfo>();
+        public List<EvaluationInfo> FinalEvaluationList { get; set; } = new List<EvaluationInfo>();


-        public List<EvaluationInfo> ReadingEvaluationList { get; set; }=new List<EvaluationInfo>();
+        public List<EvaluationInfo> ReadingEvaluationList { get; set; } = new List<EvaluationInfo>();
    }


@@ -43,6 +43,8 @@ namespace IRaCIS.Core.Application.ViewModel
    {

        public Guid? QuestionId { get; set; }
+
+        public Arm? ArmEnum { get; set; }
        public string Answer { get; set; }

        public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
@@ -135,7 +135,7 @@ namespace IRaCIS.Core.Application.Service
                                                         {
                                                             QuestionId = u.ReadingQuestionTrialId,
                                                             Answer = u.Answer,
-
+                                                             ArmEnum=u.VisitTask.ArmEnum,
                                                             FinalTranslateDictionaryCode = u.ReadingQuestionTrial.DictionaryCode
                                                         }).ToList()