From fc361856d7a18912d7419dfbde42c95ae77043cd Mon Sep 17 00:00:00 2001 From: "{872297557@qq.com}" <872297557@qq.com> Date: Wed, 7 Dec 2022 16:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/DTO/InspectionModel.cs | 2 +- .../Service/Inspection/InspectionService.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index 9404c7c89..72ec3dd26 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -344,7 +344,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO public class GetDataInspectionOutDto : DataInspection { - + public Guid? TrialReadingCriterionId { get; set; } public string TrialReadingCriterionName { get; set; } public string BlindName { get; set; } diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 7cde056be..1c9461bdc 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -151,11 +151,11 @@ namespace IRaCIS.Core.Application.Service.Inspection ObjectRelationParentId = data.ObjectRelationParentId, GeneralId = data.GeneralId, - //TrialReadingCriterionName = data.TrialReadingCriterion.CriterionName + TrialReadingCriterionId=data.TrialReadingCriterionId, + TrialReadingCriterionName = data.TrialReadingCriterion.CriterionName }; query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId) - //.WhereIf(dto.RelationDeadlineTime != null, x => x.CreateTime <= dto.RelationDeadlineTime.Value.AddSeconds(1)) .Where(x => (x.TrialId == dto.TrialId) || (x.TrialId == null && x.CreateTime >= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime)) #region 废弃 @@ -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))