From 77ae724aea04417f0e858ac06f7d9bd5529bc598 Mon Sep 17 00:00:00 2001
From: "{872297557@qq.com}" <872297557@qq.com>
Date: Wed, 7 Dec 2022 16:10:34 +0800
Subject: [PATCH] x

---
 .../Service/Inspection/InspectionService.cs                   | 4 ++--
 IRaCIS.Core.Domain/Trial/DataInspection.cs                    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index ffe29ad60..7cde056be 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -151,7 +151,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             ObjectRelationParentId = data.ObjectRelationParentId,
                             GeneralId = data.GeneralId,
 
-                            //TrialReadingCriterionName=  leftCriterion.CriterionName
+                            //TrialReadingCriterionName = data.TrialReadingCriterion.CriterionName
                         };
 
             query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
@@ -175,7 +175,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
             #endregion
                    .WhereIf(dto.BatchId != null, x => x.BatchId == dto.BatchId)
                    .WhereIf(dto.BatchId == null && dto.GeneralId != null, x => x.GeneralId == dto.GeneralId)
-                    .WhereIf(dto.TrialReadingCriterionId == null, x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId)
+                    .WhereIf(dto.TrialReadingCriterionId != null, x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId)
                    
 
                  .WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs
index 0d3f8a2dd..9bd8b2efb 100644
--- a/IRaCIS.Core.Domain/Trial/DataInspection.cs
+++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs
@@ -152,6 +152,8 @@ namespace IRaCIS.Core.Domain.Models
 
 		public Guid? DoctorUserId { get; set; }
 
+        [ForeignKey("TrialReadingCriterionId")]
+		public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
 
 	}