XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改稽查列表查询

Uat_Study
{872297557@qq.com} 2022-12-07 16:00:42 +08:00
parent b403eb9485
commit 4eda50ee34
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -345,7 +345,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public class GetDataInspectionOutDto : DataInspection
{
public string TrialReadingCriterionName { get; set; }
public string BlindName { get; set; }
//public string FirstName { get; set; } = string.Empty;
@ -487,6 +487,8 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public Guid? ObjectRelationParentId { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
}

8
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -59,6 +59,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
join usertype in _repository.GetQueryable<UserType>().IgnoreQueryFilters() on leftuser.UserTypeId equals usertype.Id into usertypetemp
from leftusertype in usertypetemp.DefaultIfEmpty()
join trialCriterion in _repository.GetQueryable<ReadingQuestionCriterionTrial>().IgnoreQueryFilters() on data.TrialReadingCriterionId equals trialCriterion.Id into criterion
from leftCriterion in criterion.DefaultIfEmpty()
//join moduleTyped in _repository.GetQueryable<Dictionary>().Where(x => x.Code == "ModuleType") on 1 equals 1
//join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ParentId = moduleTyped.Id, ModuleType = data.ModuleType } equals new { ParentId = moduleTypec.ParentId.Value, ModuleType = moduleTypec.Value } into moduleTypectemp
@ -146,7 +149,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
BatchId = data.BatchId,
OptType = leftOptType.Value,
ObjectRelationParentId = data.ObjectRelationParentId,
GeneralId = data.GeneralId
GeneralId = data.GeneralId,
TrialReadingCriterionName= leftCriterion.CriterionName
};
query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
@ -170,6 +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.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))