修改一版
parent
d16ac8a5ca
commit
0f9c391f28
|
@ -565,6 +565,11 @@
|
||||||
上传方式
|
上传方式
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetClinicalDataCheckdIndto.TrialId">
|
||||||
|
<summary>
|
||||||
|
项目ID
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto.ClinicalDataSetName">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto.ClinicalDataSetName">
|
||||||
<summary>
|
<summary>
|
||||||
名称
|
名称
|
||||||
|
@ -3291,6 +3296,13 @@
|
||||||
<param name="inDto"></param>
|
<param name="inDto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.SetClinicalDataCheckd(IRaCIS.Core.Application.Service.Reading.Dto.SetClinicalDataCheckdIndto)">
|
||||||
|
<summary>
|
||||||
|
设置勾选
|
||||||
|
</summary>
|
||||||
|
<param name="setClinicalData"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddTrialClinicalDataTrialSet(System.Guid)">
|
<member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddTrialClinicalDataTrialSet(System.Guid)">
|
||||||
<summary>
|
<summary>
|
||||||
将系统配置添加到项目配置
|
将系统配置添加到项目配置
|
||||||
|
|
|
@ -98,6 +98,45 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置勾选
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="setClinicalData"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<IResponseOutput> SetClinicalDataCheckd(SetClinicalDataCheckdIndto setClinicalData)
|
||||||
|
{
|
||||||
|
// 为了后面稽查这样写
|
||||||
|
|
||||||
|
var nocheckids =await _clinicalDataTrialSetRepository.Where(x => x.TrialId == setClinicalData.TrialId && setClinicalData.ClinicalDataTrialIds.Contains(x.Id)).Select(x => x.Id).ToListAsync();
|
||||||
|
|
||||||
|
foreach (var item in setClinicalData.ClinicalDataTrialIds)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
|
||||||
|
{
|
||||||
|
IsCheck = true
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var item in nocheckids)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
|
||||||
|
{
|
||||||
|
IsCheck = false
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
await _clinicalDataTrialSetRepository.SaveChangesAsync();
|
||||||
|
|
||||||
|
return ResponseOutput.Ok(true);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 将系统配置添加到项目配置
|
/// 将系统配置添加到项目配置
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -118,6 +157,7 @@ namespace IRaCIS.Application.Services
|
||||||
ClinicalDataLevel=x.ClinicalDataLevel,
|
ClinicalDataLevel=x.ClinicalDataLevel,
|
||||||
ClinicalUploadType=x.ClinicalUploadType,
|
ClinicalUploadType=x.ClinicalUploadType,
|
||||||
TrialId= trialId,
|
TrialId= trialId,
|
||||||
|
IsEnable=x.IsEnable,
|
||||||
}).ToList();
|
}).ToList();
|
||||||
await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets);
|
await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets);
|
||||||
var result= await _clinicalDataTrialSetRepository.SaveChangesAsync();
|
var result= await _clinicalDataTrialSetRepository.SaveChangesAsync();
|
||||||
|
|
|
@ -188,6 +188,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public class SetClinicalDataCheckdIndto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 项目ID
|
||||||
|
/// </summary>
|
||||||
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public List<Guid> ClinicalDataTrialIds { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public class GetTrialClinicalDataTrialIndto
|
public class GetTrialClinicalDataTrialIndto
|
||||||
{
|
{
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
|
@ -377,13 +377,9 @@ namespace IRaCIS.Application.Services
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisitList(GetSubjectReadVisitsInDto inDto)
|
public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisitList(GetSubjectReadVisitsInDto inDto)
|
||||||
{
|
{
|
||||||
|
|
||||||
var maxReadVisit = await _readModuleRepository.Where(x => x.SubjectId == inDto.SubjectId&&x.ReadingSetType==inDto.ReadingSetType && x.ModuleType != ModuleTypeEnum.Global).OrderByDescending(x=>x.VisitNum).FirstOrDefaultAsync();
|
var maxReadVisit = await _readModuleRepository.Where(x => x.SubjectId == inDto.SubjectId&&x.ReadingSetType==inDto.ReadingSetType && x.ModuleType != ModuleTypeEnum.Global).OrderByDescending(x=>x.VisitNum).FirstOrDefaultAsync();
|
||||||
|
|
||||||
var maxReadVisitNum= maxReadVisit==null?0:maxReadVisit.VisitNum;
|
var maxReadVisitNum= maxReadVisit==null?0:maxReadVisit.VisitNum;
|
||||||
|
|
||||||
var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null);
|
var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null);
|
||||||
|
|
||||||
var finalVisitNum = await visitQuery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
|
var finalVisitNum = await visitQuery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue