修复是否参与评估bug

2023-04-28 14:09:12 +08:00
parent bca9993e68
commit 2eecca60f0
5 changed files with 10 additions and 7 deletions
@@ -125,7 +125,8 @@ namespace IRaCIS.Core.Application.Service
                                                         Id = subjectCriteriaEvaluation.Id,
                                                         TrialReadingCriterionId = inQuery.TrialReadingCriterionId,

-                                                         IsImageFiltering = subjectCriteriaEvaluation.SubjectCriteriaEvaluationVisitFilterList.Any(t => t.ImageFilterState == ImageFilterState.None),
+                                                         IsImageFiltering = subject.SubjectCriteriaEvaluationVisitFilterList.Any(t => t.TrialReadingCriterionId== inQuery.TrialReadingCriterionId
+                                                         &&  t.ImageFilterState == ImageFilterState.None),

                                                         IsJoinEvaluation = subjectCriteriaEvaluation.IsJoinEvaluation,

@@ -121,10 +121,6 @@ namespace IRaCIS.Core.Domain.Models
        public Subject Subject { get; set; }


-        [JsonIgnore]
-
-        public SubjectCriteriaEvaluationVisitFilter SubjectCriteriaEvaluationVisitFilter { get; set;}
-
        [JsonIgnore]
        public List<TaskMedicalReview> TaskMedicalReviewList { get; set; }

@@ -24,6 +24,9 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("TrialReadingCriterionId")]
        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }

+        [JsonIgnore]
+        public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
+
        /// <summary>
        /// SubjectId
        /// </summary>
@@ -67,8 +70,7 @@ namespace IRaCIS.Core.Domain.Models
 		public DateTime UpdateTime { get; set; }


-		[JsonIgnore]
-		public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
+	



@@ -24,6 +24,8 @@ namespace IRaCIS.Core.Domain.Models
        [JsonIgnore]
        [ForeignKey("TrialReadingCriterionId")]
        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+
+
        [JsonIgnore]
        public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; }

@@ -12,6 +12,8 @@ namespace IRaCIS.Core.Domain.Models
    [Table("Subject")]
    public class Subject : Entity, IAuditAdd, IAuditUpdate, ISoftDelete
    {
+      
+
        [JsonIgnore]
        public List<SubjectVisit> SubjectVisitList { get; set; } = new List<SubjectVisit>();
        [JsonIgnore]