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

修改一版

Uat_Study
he 2022-06-08 16:01:11 +08:00
parent d53e43a82b
commit a058f7e47f
6 changed files with 97 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1035,6 +1035,21 @@
计划条数
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto.TrialId">
<summary>
项目ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto.ReadingPeriodSetId">
<summary>
配置ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto.ReadingSetType">
<summary>
阅片配置的类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect.Id">
<summary>
项目ID
@ -3294,6 +3309,13 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingPeriodSetService.GetReadingVisitList(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingVisitListInDto)">
<summary>
获取阅片期配置的截至访视的下拉框
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingPeriodSetService.SetReadingPeriodSetEffect(IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect)">
<summary>
设置阅片期配置是否生效

17
IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
View File

@ -26,8 +26,8 @@ namespace IRaCIS.Application.Services
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ClinicalData> clinicalDataRepository,
IRepository<ClinicalDataSet> ClinicalDataSetRepository,
IRepository<PreviousPDF> previousPDFRepository
IRepository<ClinicalDataSet> ClinicalDataSetRepository,
IRepository<PreviousPDF> previousPDFRepository
)
{
_subjectVisitRepository = subjectVisitRepository;
@ -68,16 +68,23 @@ namespace IRaCIS.Application.Services
}
//public List<ClinicalDataSetView> GetClinicalDataSetList()
//{
//}
/// <summary>
/// 将系统配置添加到项目配置
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto)
private async Task<IResponseOutput> AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto)
{
var systemIds = await _clinicalDataSetRepository.Where(x => x.TrialId == null).Select(x => x.Id).ToListAsync();
var trialSystemIds =await _clinicalDataSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
var needAddids = inDto.Ids.Except(trialSystemIds).ToList();
var needAddids = systemIds.Except(trialSystemIds).ToList();
var systemDataList =await _clinicalDataSetRepository.Where(x => needAddids.Contains(x.Id)).ToListAsync();
List<ClinicalDataSet> dataSets = systemDataList.Select(x => new ClinicalDataSet()
{

2
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
View File

@ -122,8 +122,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class AddTrialClinicalDataSetInDto
{
public List<Guid> Ids { get; set; } = new List<Guid>();
public Guid TrialId { get; set; }
}
}

27
IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs
View File

@ -264,6 +264,33 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
}
public class GetReadingVisitListOutDto
{
public Guid VisitStageId { get; set; }
public decimal VisitNum { get; set; }
public string VisitName { get; set; } = string.Empty;
}
public class GetReadingVisitListInDto
{
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 配置ID
/// </summary>
public Guid? ReadingPeriodSetId { get; set; }
/// <summary>
/// 阅片配置的类型
/// </summary>
public ReadingSetType ReadingSetType { get; set; }
}
public class SetReadingPeriodSetEffect
{
/// <summary>

30
IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
View File

@ -23,19 +23,22 @@ namespace IRaCIS.Application.Services
public IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
private readonly IRepository<ReadModule> _readModuleRepository;
private readonly IRepository<VisitStage> _visitStageRepository;
private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
private readonly IRepository<Site> _siteSetRepository;
public ReadingPeriodSetService(IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ReadingPeriodSet> ReadingPeriodSetRepository,
IRepository<ReadingPeriodSet> ReadingPeriodSetRepository,
IRepository<ReadModule> readModuleRepository,
IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
IRepository<Site> SiteSetRepository
IRepository<VisitStage> visitStageRepository,
IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
IRepository<Site> SiteSetRepository
)
{
_subjectVisitRepository = subjectVisitRepository;
_readingPeriodSetRepository = ReadingPeriodSetRepository;
this._readModuleRepository = readModuleRepository;
this._visitStageRepository = visitStageRepository;
this._readingPeriodPlanRepository = readingPeriodPlanRepository;
_siteSetRepository = SiteSetRepository;
}
@ -126,7 +129,7 @@ namespace IRaCIS.Application.Services
//var
var existsBubjectVisits = await _readModuleRepository.Where(y => y.ReadingSetType == inDto.ReadingSetType && y.TrialId == inDto.TrialId).Select(x => x.SubjectVisitId).ToListAsync();
visitQuery = visitQuery.Where(x => existsBubjectVisits.Where(y =>x.Id == y).Count() == 0)
visitQuery = visitQuery.Where(x => !existsBubjectVisits.Contains(x.Id))
.WhereIf(inDto.ExpirationDate != null, x => x.LatestScanDate <= inDto.ExpirationDate.Value)
.WhereIf(inDto.ExpirationVisitNum != null, x => x.VisitNum == inDto.ExpirationVisitNum);
@ -277,6 +280,25 @@ namespace IRaCIS.Application.Services
}
/// <summary>
/// 获取阅片期配置的截至访视的下拉框
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<GetReadingVisitListOutDto>> GetReadingVisitList(GetReadingVisitListInDto inDto)
{
var visitStageIdList = await _readingPeriodSetRepository.Where(x => x.TrialId == inDto.TrialId && x.Id != inDto.ReadingPeriodSetId&&x.VisitStageId!=null&&x.ReadingSetType==inDto.ReadingSetType).Select(x => x.VisitStageId).ToListAsync();
List<GetReadingVisitListOutDto> result = await _visitStageRepository.Where(x => x.TrialId == inDto.TrialId && !visitStageIdList.Contains(x.Id)).Select(x => new GetReadingVisitListOutDto()
{
VisitName = x.VisitName,
VisitNum = x.VisitNum,
VisitStageId = x.Id,
}).ToListAsync();
return result;
}
/// <summary>
/// 设置阅片期配置是否生效

10
IRaCIS.Core.Domain/Reading/ClinicalDataSet.cs
View File

@ -53,6 +53,16 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid CreateUserId { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 是否勾选
/// </summary>
public bool IsCheck { get; set; }
}