XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Test.EIImageViewer
he 2022-05-05 14:06:45 +08:00
parent 9721a67708
commit ca44f1ea82
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -56,6 +56,13 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.CopyFrontAuditConfigItem(IRaCIS.Core.Infra.EFCore.Dto.CopyFrontAuditConfigItemDto)">
<summary>
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.BatchAddFrontAudit(IRaCIS.Core.Application.ViewModel.BatchAddFrontAudit)"> <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.BatchAddFrontAudit(IRaCIS.Core.Application.ViewModel.BatchAddFrontAudit)">
<summary> <summary>
批量添加字段 批量添加字段

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

@ -426,7 +426,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// <summary> /// <summary>
/// 功能模块 /// 功能模块
/// </summary> /// </summary>
public string ModuleType { get; set; } = string.Empty; public Guid? ModuleType { get; set; }
/// <summary> /// <summary>
/// Description /// Description

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

@ -90,19 +90,19 @@ namespace IRaCIS.Core.Application.Service.Inspection
join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId } equals new { ModuleType = moduleTypec.Id.ToString() } into moduleTypectemp join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId.Value } equals new { ModuleType = moduleTypec.Id } into moduleTypectemp
from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty() from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty()
join OptTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.OptTypeId } equals new { ModuleType = OptTypec.Id.ToString() } into optTypetemp join OptTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.OptTypeId.Value } equals new { ModuleType = OptTypec.Id } into optTypetemp
from leftOptType in optTypetemp.DefaultIfEmpty() from leftOptType in optTypetemp.DefaultIfEmpty()
select new GetDataInspectionOutDto() select new GetDataInspectionOutDto()
{ {
CreateTime = data.CreateTime, CreateTime = data.CreateTime,
CreateUserId = data.CreateUserId, CreateUserId = data.CreateUserId,
ModuleType = leftmoduleTypec.Id.ToString(), ModuleType = leftmoduleTypec.Id,
BlindName = data.BlindName, BlindName = data.BlindName,
TrialId = data.TrialId, TrialId = data.TrialId,
SiteId = data.SiteId, SiteId = data.SiteId,
@ -140,7 +140,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
SignText= lefttrialSign.SignText, SignText= lefttrialSign.SignText,
Identification= leftfrontAuditConfig.Identification, Identification= leftfrontAuditConfig.Identification,
ParentIdentification = leftparent.Identification, ParentIdentification = leftparent.Identification,
OptType = leftOptType.Value, OptType = leftOptType.Id,
VisitNum=leftsubjectVisit.VisitNum, VisitNum=leftsubjectVisit.VisitNum,
IsFrontAdd=data.IsFrontAdd IsFrontAdd=data.IsFrontAdd
@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
.WhereIf(dto.VisitPlanInfo != null, x => x.VisitNum == dto.VisitPlanInfo) .WhereIf(dto.VisitPlanInfo != null, x => x.VisitNum == dto.VisitPlanInfo)
.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.IsNullOrEmpty(), x => x.ModuleType == dto.ModuleType) .WhereIf(dto.ModuleType!=null, x => x.ModuleType == dto.ModuleType)
.WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description) .WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description)
.WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName)) .WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName))
//.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo)) //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))