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

修改一版

Uat_Study
he 2022-06-07 18:11:24 +08:00
parent 8294628066
commit e9572c2810
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,6 +361,8 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public decimal? VisitNum { get; set; } public decimal? VisitNum { get; set; }
public bool InPlan { get; set; }
public string OptTypeName { get; set; } = string.Empty; public string OptTypeName { get; set; } = string.Empty;
public Guid? FrontAuditConfigId { get; set; } public Guid? FrontAuditConfigId { get; set; }

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

@ -42,8 +42,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
join site in _repository.GetQueryable<Site>().IgnoreQueryFilters() on data.SiteId equals site.Id into sitetemp join site in _repository.GetQueryable<Site>().IgnoreQueryFilters() on data.SiteId equals site.Id into sitetemp
from leftsite in sitetemp.DefaultIfEmpty() from leftsite in sitetemp.DefaultIfEmpty()
// join trialSite in _repository.GetQueryable<TrialSite>().IgnoreQueryFilters() on new { SiteId=data.SiteId,tria } equals new { SiteId= trialSite.SiteId }into sitetemp join trialSite in _repository.GetQueryable<TrialSite>().IgnoreQueryFilters() on new { SiteId = leftsite.Id, Trialid= leftrial.Id } equals new { SiteId = trialSite.SiteId , Trialid = trialSite.TrialId } into trialSitetemp
// from leftsite in sitetemp.DefaultIfEmpty() from lefttrialSite in trialSitetemp.DefaultIfEmpty()
join subject in _repository.GetQueryable<Subject>().IgnoreQueryFilters() on data.SubjectId equals subject.Id into subtemp join subject in _repository.GetQueryable<Subject>().IgnoreQueryFilters() on data.SubjectId equals subject.Id into subtemp
@ -118,7 +118,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
CreateUserName = leftuser.FirstName + leftuser.LastName, CreateUserName = leftuser.FirstName + leftuser.LastName,
RoleName= leftusertype.UserTypeShortName, RoleName= leftusertype.UserTypeShortName,
TrialName= leftrial.ExperimentName, TrialName= leftrial.ExperimentName,
SiteCode=leftsite.SiteCode, SiteCode= lefttrialSite.TrialSiteCode,
ResearchProgramNo= leftrial.ResearchProgramNo, ResearchProgramNo= leftrial.ResearchProgramNo,
ObjectType=data.ObjectType, ObjectType=data.ObjectType,
Description=leftfrontAuditConfig.Description, Description=leftfrontAuditConfig.Description,
@ -129,15 +129,17 @@ namespace IRaCIS.Core.Application.Service.Inspection
ParentIdentification = leftparent.Identification, ParentIdentification = leftparent.Identification,
OptType = leftOptType.Id, OptType = leftOptType.Id,
VisitNum=leftsubjectVisit.VisitNum, VisitNum=leftsubjectVisit.VisitNum,
InPlan= leftsubjectVisit.InPlan,
//IsFrontAdd=data.IsFrontAdd, //IsFrontAdd=data.IsFrontAdd,
BatchId=data.BatchId, BatchId =data.BatchId,
OptTypeName = leftOptType.Value, OptTypeName = leftOptType.Value,
}; };
query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId) query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
.WhereIf(dto.BatchId != null, x => x.BatchId == dto.BatchId) .WhereIf(dto.BatchId != null, x => x.BatchId == dto.BatchId)
.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo)) .WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
.WhereIf(dto.VisitPlanInfo != null, x => x.VisitNum == dto.VisitPlanInfo) //.WhereIf(dto.VisitPlanInfo != null&& dto.VisitPlanInfo!=(decimal) 1.11, x => x.VisitNum == dto.VisitPlanInfo)
//.WhereIf(dto.VisitPlanInfo != (decimal)1.11,x=>x.InPlan!=null&& x.InPlan==false)
.WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime) .WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime)
.WhereIf(dto.EndTime != null, x => x.CreateTime <= dto.EndTime) .WhereIf(dto.EndTime != null, x => x.CreateTime <= dto.EndTime)
.WhereIf(dto.ModuleType!=null, x => x.ModuleType == dto.ModuleType) .WhereIf(dto.ModuleType!=null, x => x.ModuleType == dto.ModuleType)
@ -146,7 +148,13 @@ namespace IRaCIS.Core.Application.Service.Inspection
//.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo)) //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
.WhereIf(dto.IsSign != null, x => x.IsSign == dto.IsSign); .WhereIf(dto.IsSign != null, x => x.IsSign == dto.IsSign);
#endregion #endregion
if (dto.VisitPlanInfo != null && dto.VisitPlanInfo.Value != (decimal)1.11)
{
query = query.Where(x => x.VisitNum == dto.VisitPlanInfo.Value);
} else if (dto.VisitPlanInfo != null)
{
query = query.Where(x => x.InPlan == false);
}
dto.Asc = false; dto.Asc = false;