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

增加Global Using
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2024-09-20 10:19:08 +08:00
parent 115017197b
commit fc30cb39ee
408 changed files with 11031 additions and 12556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
+15 -17
View File
@@ -1,15 +1,13 @@
using System;
using IRaCIS.Core.Infrastructure.Extention;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Application.Contracts
{
{
public class SubjectCommand
{
public Guid? Id { get; set; }
public string Code { get; set; } = String.Empty;
public int? Age { get; set; }
public string Sex { get; set; } = string.Empty;
@@ -66,9 +64,9 @@ namespace IRaCIS.Application.Contracts
public class TrialSubjectConfig
{
public string SubjectCodeRule { get; set; } = string.Empty;
public bool IsNoticeSubjectCodeRule { get; set; }
public bool IsNoticeSubjectCodeRule { get; set; }
public bool IsHaveFirstGiveMedicineDate { get; set; }
public bool IsEnrollementQualificationConfirm { get; set; }
public bool IsEnrollementQualificationConfirm { get; set; }
public bool IsHaveSubjectAge { get; set; }
public string OutEnrollmentVisitName { get; set; } = string.Empty;
public bool VisitPlanConfirmed { get; set; }
@@ -78,13 +76,13 @@ namespace IRaCIS.Application.Contracts
public bool IsPDProgressView { get; set; }
public bool IsSubjectSecondCodeView { get; set; } = false;
public bool IsSubjectSecondCodeView { get; set; } = false;
}
public class SubjectQueryView: SubjectCommand
public class SubjectQueryView : SubjectCommand
{
public DateTime? OutEnrollmentTime { get; set; }
@@ -130,11 +128,11 @@ namespace IRaCIS.Application.Contracts
public string LatestBlindName { get; set; } = string.Empty;
public bool IsMissingImages { get; set; }
public bool IsMissingImages { get; set; }
public Guid LatestSubmitSubjectVisitId { get; set; }
public Guid LatestSubmitSubjectVisitId { get; set; }
}
@@ -143,7 +141,7 @@ namespace IRaCIS.Application.Contracts
public class SubjectQueryParam : PageInput
{
[NotDefault]
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string Code { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
@@ -151,9 +149,9 @@ namespace IRaCIS.Application.Contracts
public string Sex { get; set; } = string.Empty;
public bool? IsMissingImages { get; set; }
public Guid? TrialSiteId { get; set; }
public SubjectStatus? Status { get; set; }
public bool? IsMissingImages { get; set; }
public Guid? TrialSiteId { get; set; }
public SubjectStatus? Status { get; set; }
}
@@ -167,7 +165,7 @@ namespace IRaCIS.Application.Contracts
public string Code { get; set; } = string.Empty;
public string Sex { get; set; } = string.Empty;
public string Sex { get; set; } = string.Empty;
public int? Age { get; set; }
public SubjectStatus Status { get; set; }
IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
+1 -4
View File
@@ -1,10 +1,7 @@
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure.Extention;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Web;
namespace IRaCIS.Application.Contracts
{
@@ -398,7 +395,7 @@ namespace IRaCIS.Application.Contracts
public List<Guid> SCPStudyIdList { get; set; }
}
public class SubmitVisitStudyBindingCommand: VerifyPacsImageCommand
public class SubmitVisitStudyBindingCommand : VerifyPacsImageCommand
{
IRaCIS.Core.Application/Service/Visit/DTO/VisitPlanViewModel.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using IRaCIS.Core.Infrastructure.Extention;
using MiniExcelLibs.Attributes;
using MiniExcelLibs.Attributes;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Application.Contracts
IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
+1 -3
View File
@@ -1,9 +1,7 @@
using IRaCIS.Core.Infrastructure.Extention;
using IRaCIS.Core.Application.Contracts.Dicom.DTO;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Application.Contracts.Dicom.DTO;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
using IRaCIS.Core.Application.Service.Inspection.DTO;
namespace IRaCIS.Core.Application.Contracts
{
IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs
-1
View File
@@ -1,5 +1,4 @@
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Infra.EFCore;
using Microsoft.AspNetCore.Mvc;
namespace IRaCIS.Application.Interfaces
IRaCIS.Core.Application/Service/Visit/PatientService.cs
+8 -38
View File
@@ -1,47 +1,17 @@
using IRaCIS.Application.Interfaces;
using FellowOakDicom;
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Contracts.Dicom.DTO;
using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Domain.Share;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using IRaCIS.Core.Application.Auth;
using MassTransit;
using Panda.DynamicWebApi.Attributes;
using DocumentFormat.OpenXml.Spreadsheet;
using AutoMapper.EntityFrameworkCore;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Application.Service.Reading.Dto;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SharpCompress.Common;
using System.Reactive.Subjects;
using Subject = IRaCIS.Core.Domain.Models.Subject;
using IRaCIS.Core.Application.ViewModel;
using Medallion.Threading;
using IRaCIS.Core.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Pipelines.Sockets.Unofficial.Arenas;
using IRaCIS.Core.Application.Contracts;
using MailKit.Search;
using DocumentFormat.OpenXml.Office2010.Excel;
using IRaCIS.Core.Application.Contracts.Dicom.DTO;
using IRaCIS.Core.Application.Helper;
using NPOI.SS.Formula.Functions;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Text;
using DocumentFormat.OpenXml.EMMA;
using Azure;
using System.IO.Compression;
using static IRaCIS.Core.Domain.Share.StaticData;
using FellowOakDicom;
using DocumentFormat.OpenXml.Office2010.Drawing;
using IDistributedLockProvider = Medallion.Threading.IDistributedLockProvider;
using DocumentFormat.OpenXml.InkML;
using Subject = IRaCIS.Core.Domain.Models.Subject;
namespace IRaCIS.Application.Services
namespace IRaCIS.Core.Application.Service
{
[ApiExplorerSettings(GroupName = "Trial")]
public class PatientService(
@@ -57,7 +27,7 @@ namespace IRaCIS.Application.Services
IDistributedLockProvider _distributedLockProvider) : BaseService
{
[HttpGet]
@@ -319,7 +289,7 @@ namespace IRaCIS.Application.Services
var subjectId = inCommand.SubjectId;
var isVerifyVisitImageDate = await _trialRepository.Where(t => t.Id == inCommand.TrialId).Select(t => t.IsVerifyVisitImageDate).FirstNotNullAsync();
var isVerifyVisitImageDate = await _trialRepository.Where(t => t.Id == inCommand.TrialId).Select(t => t.IsVerifyVisitImageDate).FirstNotNullAsync();
var result = new List<VerifySCPStudyUploadResult>();
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
+10 -14
View File
@@ -1,14 +1,10 @@
using IRaCIS.Application.Interfaces;
using IRaCIS.Application.Contracts;
using IRaCIS.Application.Contracts;
using IRaCIS.Application.Interfaces;
using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Domain.Share;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using IRaCIS.Core.Application.Auth;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Infrastructure;
namespace IRaCIS.Application.Services
namespace IRaCIS.Core.Application.Service
{
[ApiExplorerSettings(GroupName = "Trial")]
public class SubjectService(
@@ -16,7 +12,7 @@ namespace IRaCIS.Application.Services
IRepository<Trial> _trialRepository,
IRepository<SubjectVisit> _subjectVisitRepository) : BaseService, ISubjectService
{
/// <summary>
/// 添加或更新受试者信息[New]
@@ -115,17 +111,17 @@ namespace IRaCIS.Application.Services
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Name), t => t.ShortName.Contains(inQuery.Name))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Sex), t => t.Sex.Contains(inQuery.Sex))
.WhereIf(inQuery.Status != null, t => t.Status == inQuery.Status)
.WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
.WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
// CRC 只负责他管理site的受试者
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id))
.ProjectTo<SubjectQueryView>(_mapper.ConfigurationProvider)
.WhereIf(inQuery.IsMissingImages != null, t => t.IsMissingImages == inQuery.IsMissingImages);
.WhereIf(inQuery.IsMissingImages != null, t => t.IsMissingImages == inQuery.IsMissingImages);
var pageList = await subjectQuery.ToPagedListAsync(inQuery,nameof(SubjectQueryView.Code));
var pageList = await subjectQuery.ToPagedListAsync(inQuery, nameof(SubjectQueryView.Code));
var trialConfig = await _trialRepository.Where(t => t.Id == inQuery.TrialId).ProjectTo<TrialSubjectConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
var trialConfig = await _trialRepository.Where(t => t.Id == inQuery.TrialId).ProjectTo<TrialSubjectConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
return ResponseOutput.Ok(pageList, trialConfig);
@@ -158,6 +154,6 @@ namespace IRaCIS.Application.Services
}
}
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+8 -16
View File
@@ -1,21 +1,13 @@
using IRaCIS.Core.Application.Filter;
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Contracts.Dicom.DTO;
using Microsoft.AspNetCore.Authorization;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Infrastructure;
using IRaCIS.Core.Application.Auth;
using IRaCIS.Core.Infra.EFCore.Common;
using MassTransit;
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Application.Services;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using DocumentFormat.OpenXml.Drawing.Charts;
using IRaCIS.Core.Domain.Models;
using NPOI.SS.Formula.Functions;
namespace IRaCIS.Core.Application.Services
{
@@ -676,8 +668,8 @@ namespace IRaCIS.Core.Application.Services
{
var nodicom = noDicomList.Where(x => x.Id == item.StudyId).First();
var instanceCount = await _noneDicomStudyFileRepository.WhereIf(isExistTaskNoneDicomFile,x=>x.OriginNoneDicomStudyId== item.StudyId)
.WhereIf(isExistTaskNoneDicomFile==false, x=>x.NoneDicomStudyId == item.StudyId).CountAsync();
var instanceCount = await _noneDicomStudyFileRepository.WhereIf(isExistTaskNoneDicomFile, x => x.OriginNoneDicomStudyId == item.StudyId)
.WhereIf(isExistTaskNoneDicomFile == false, x => x.NoneDicomStudyId == item.StudyId).CountAsync();
if (instanceCount == 0)
{
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+19 -21
View File
@@ -1,14 +1,12 @@
using IRaCIS.Application.Interfaces;
using IRaCIS.Application.Contracts;
using IRaCIS.Application.Contracts;
using IRaCIS.Application.Interfaces;
using IRaCIS.Core.Application.Filter;
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure;
using Microsoft.AspNetCore.Authorization;
using IRaCIS.Core.Application.Auth;
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
namespace IRaCIS.Application.Services
namespace IRaCIS.Core.Application.Service
{
[ApiExplorerSettings(GroupName = "Trial")]
public class VisitPlanService(
@@ -20,7 +18,7 @@ namespace IRaCIS.Application.Services
IRepository<Subject> _subjectRepository,
IRepository<VisitPlanInfluenceStat> _visitPlanInfluenceStatRepository) : BaseService, IVisitPlanService
{
///暂时不用
@@ -32,7 +30,7 @@ namespace IRaCIS.Application.Services
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Keyword), t => t.VisitName.Contains(inQuery.Keyword))
.ProjectTo<VisitStageDTO>(_mapper.ConfigurationProvider);
return await visitStageQuery.ToPagedListAsync(inQuery,nameof(VisitStageDTO.CreateTime));
return await visitStageQuery.ToPagedListAsync(inQuery, nameof(VisitStageDTO.CreateTime));
}
@@ -53,18 +51,18 @@ namespace IRaCIS.Application.Services
TimePointsPerPatient = trial.TimePointsPerPatient,
VisitPlanConfirmed = trial.VisitPlanConfirmed,
IsHaveFirstGiveMedicineDate = trial.IsHaveFirstGiveMedicineDate,
BlindBaseLineName=trial.BlindBaseLineName,
BlindFollowUpPrefix=trial.BlindFollowUpPrefix,
IsHaveGeneratedTask= isHaveGeneratedTask,
BlindBaseLineName = trial.BlindBaseLineName,
BlindFollowUpPrefix = trial.BlindFollowUpPrefix,
IsHaveGeneratedTask = isHaveGeneratedTask,
//SubjectHasAdded = _subjectVisitRepository.Any(t => t.TrialId == trialId)
};
}
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
public async Task<IResponseOutput> UpdateVisitBlindName(VisitBlindNameCommand command)
public async Task<IResponseOutput> UpdateVisitBlindName(VisitBlindNameCommand command)
{
await _trialRepository.UpdatePartialFromQueryAsync(command.TrialId, t => new Trial() { BlindBaseLineName = command.BlindBaseLineName, BlindFollowUpPrefix = command.BlindFollowUpPrefix });
await _trialRepository.UpdatePartialFromQueryAsync(command.TrialId, t => new Trial() { BlindBaseLineName = command.BlindBaseLineName, BlindFollowUpPrefix = command.BlindFollowUpPrefix });
await _trialRepository.SaveChangesAsync();
@@ -115,7 +113,7 @@ namespace IRaCIS.Application.Services
//比当前 visitNum小的 visitDay的最大值 还小 不允许添加
if (visitPlan.VisitDay <= visitPlanList.Where(t => t.VisitNum < visitPlan.VisitNum).Select(t => t.VisitDay).Max())
{
//---访视计划中，访视号大的访视，其访视间隔也应该比访视号小的访视大。
//---访视计划中，访视号大的访视，其访视间隔也应该比访视号小的访视大。
throw new BusinessValidationFailedException(_localizer["VisitPlan_LargerVisitNumLargerInterval"]);
}
@@ -125,7 +123,7 @@ namespace IRaCIS.Application.Services
{
if (visitPlan.VisitDay >= visitPlanList.Where(t => t.VisitNum > visitPlan.VisitNum).Select(t => t.VisitDay).Min())
{
//---访视计划中，访视号大的计划访视，其访视间隔也应该比访视号小的计划访视大。
//---访视计划中，访视号大的计划访视，其访视间隔也应该比访视号小的计划访视大。
throw new BusinessValidationFailedException(_localizer["VisitPlan_LargerPlanNumLargerInterval"]);
}
}
@@ -137,13 +135,13 @@ namespace IRaCIS.Application.Services
if (await _visitStageRepository.AnyAsync(t => t.TrialId == visitPlan.TrialId && (t.VisitName == visitPlan.VisitName || t.VisitNum == visitPlan.VisitNum), true))
{
//---访视计划中已经存在具有项目访视名称或者访视号的计划访视模板。
//---访视计划中已经存在具有项目访视名称或者访视号的计划访视模板。
throw new BusinessValidationFailedException(_localizer["VisitPlan_ExistNameOrNumTemplate"]);
}
if (await _visitStageRepository.AnyAsync(t => t.TrialId == visitPlan.TrialId && t.IsBaseLine, true) && visitPlan.IsBaseLine)
{
//---访视计划中已经存在基线。
//---访视计划中已经存在基线。
throw new BusinessValidationFailedException(_localizer["VisitPlan_ExistBaseline"]);
}
@@ -162,13 +160,13 @@ namespace IRaCIS.Application.Services
if (await _visitStageRepository.AnyAsync(t => t.TrialId == visitPlan.TrialId && (t.VisitName == visitPlan.VisitName || t.VisitNum == visitPlan.VisitNum) && t.Id != visitPlan.Id, true))
{
//---访视计划中已经存在具有项目访视名称或者访视号的计划访视模板。
//---访视计划中已经存在具有项目访视名称或者访视号的计划访视模板。
throw new BusinessValidationFailedException(_localizer["VisitPlan_ExistNameOrNumTemplate"]);
}
if (await _visitStageRepository.AnyAsync(t => t.TrialId == visitPlan.TrialId && t.IsBaseLine && t.Id != visitPlan.Id, true) && visitPlan.IsBaseLine)
{
//---访视计划中已经存在基线。
//---访视计划中已经存在基线。
throw new BusinessValidationFailedException(_localizer["VisitPlan_ExistBaseline"]);
}
@@ -182,7 +180,7 @@ namespace IRaCIS.Application.Services
{
if (await _subjectVisitRepository.Where(t => t.TrialId == visitPlan.TrialId).AnyAsync(v => v.IsBaseLine && v.SubmitState >= SubmitStateEnum.ToSubmit))
{
//---有受试者的基线已经上传了影像数据,不允许修改基线访视。
//---有受试者的基线已经上传了影像数据,不允许修改基线访视。
throw new BusinessValidationFailedException(_localizer["VisitPlan_ExistBaselineImgNoModify"]);
}
}
@@ -482,7 +480,7 @@ namespace IRaCIS.Application.Services
FileDownloadName = _localizer["VisitPlan_CheckExport", DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")]
};
}
IRaCIS.Core.Application/Service/Visit/_MapConfig.cs
+12 -12
View File
@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitStage, VisitStageSelectDTO>();
CreateMap<VisitStage, SubjectVisit>()
.ForMember(d => d.Id, t => t.Ignore())
.ForMember(d => d.VisitStageId, t =>t.MapFrom(u=>u.Id));
.ForMember(d => d.VisitStageId, t => t.MapFrom(u => u.Id));
@@ -28,10 +28,10 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitPlanInfluenceStat, VisitPlanInfluenceSubjectVisitStatDTO>()
.ForMember(d => d.CreateUser, u => u.MapFrom(g => g.CreateUser.LastName + " / " + g.CreateUser.FirstName));
CreateMap<SubjectStatusChangeCommand, Subject>()
.ForMember(d => d.Id, t => t.MapFrom(u=>u.SubjectId));
.ForMember(d => d.Id, t => t.MapFrom(u => u.SubjectId));
CreateMap<VisitStage, VisitStageDTO>();
CreateMap<Subject, SubjectQueryView>()
@@ -41,8 +41,8 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.LatestVisitName, u => u.MapFrom(s => s.LatestSubjectVisit.VisitName))
//.ForMember(d => d.FinalSubjectVisitId, u => u.MapFrom(s => s.SubjectVisitList.Where(t => t.IsFinalVisit).Select(c => (Guid?)c.Id).FirstOrDefault()))
//.ForMember(d => d.FinalSubjectVisitName, u => u.MapFrom(s => s.SubjectVisitList.Where(t => t.IsFinalVisit).Select(c => c.VisitName).FirstOrDefault()))
//.ForMember(d => d.FinalSubjectVisitId, u => u.MapFrom(s => s.SubjectVisitList.Where(t => t.IsFinalVisit).Select(c => (Guid?)c.Id).FirstOrDefault()))
//.ForMember(d => d.FinalSubjectVisitName, u => u.MapFrom(s => s.SubjectVisitList.Where(t => t.IsFinalVisit).Select(c => c.VisitName).FirstOrDefault()))
.ForMember(d => d.FinalSubjectVisitId, u => u.MapFrom(s => s.FinalSubjectVisitId))
.ForMember(d => d.FinalSubjectVisitName, u => u.MapFrom(s => s.FinalSubjectVisit.VisitName))
@@ -62,12 +62,12 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.InPlanVisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.InPlan)))
.ForMember(d => d.OutPlanVisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.InPlan == false)))
//执行不一定上传了 可能是失访 实际执行过了
//执行不一定上传了 可能是失访 实际执行过了
.ForMember(d => d.MissingSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.VisitNum <s.LatestSubjectVisit.VisitNum && t.SubmitState != SubmitStateEnum.Submitted && t.IsLostVisit == false)))
.ForMember(d => d.IsMissingImages, u => u.MapFrom(s => s.SubjectVisitList.Any(t => t.VisitNum < s.LatestSubjectVisit.VisitNum && t.SubmitState != SubmitStateEnum.Submitted && t.IsLostVisit == false)))
.ForMember(d => d.InPlanVisitSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.SubmitState == SubmitStateEnum.Submitted && t.InPlan == true)))
.ForMember(d => d.MissingSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.VisitNum < s.LatestSubjectVisit.VisitNum && t.SubmitState != SubmitStateEnum.Submitted && t.IsLostVisit == false)))
.ForMember(d => d.IsMissingImages, u => u.MapFrom(s => s.SubjectVisitList.Any(t => t.VisitNum < s.LatestSubjectVisit.VisitNum && t.SubmitState != SubmitStateEnum.Submitted && t.IsLostVisit == false)))
.ForMember(d => d.InPlanVisitSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.SubmitState == SubmitStateEnum.Submitted && t.InPlan == true)))
.ForMember(d => d.LostVisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.IsLostVisit)))
.ForMember(d => d.InPlanVisitSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.SubmitState == SubmitStateEnum.Submitted && t.InPlan == true)))
.ForMember(d => d.OutPlanVisitSubmmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.SubmitState == SubmitStateEnum.Submitted && t.InPlan == false)));
@@ -88,7 +88,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<SubjectVisit, DicomTrialSiteSubjectInfo>().IncludeMembers(t=>t.Trial)
CreateMap<SubjectVisit, DicomTrialSiteSubjectInfo>().IncludeMembers(t => t.Trial)
.ForMember(d => d.TrialSiteAliasName, u => u.MapFrom(s => s.TrialSite.TrialSiteAliasName))
.ForMember(d => d.SubjectVisitId, u => u.MapFrom(s => s.Id))
.ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
@@ -127,5 +127,5 @@ namespace IRaCIS.Core.Application.Service
}
}
}