修改
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
parent
7770fc264b
commit
8496e6bcd7
|
@ -44,9 +44,9 @@ public class GetTrialFileTypeDataInDto
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否授权
|
/// 是否启用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsAuthorizedView { get; set; } = false;
|
public bool IsEnable { get; set; } = false;
|
||||||
}
|
}
|
||||||
public class CopySystemFileTypeToTrialInDto
|
public class CopySystemFileTypeToTrialInDto
|
||||||
{
|
{
|
||||||
|
|
|
@ -138,15 +138,20 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
|
||||||
TrialId = inDto.TrialId
|
TrialId = inDto.TrialId
|
||||||
});
|
});
|
||||||
var trialFileTypeList = await _trialFileTypeRepository.Where(x=>x.TrialId==inDto.TrialId)
|
var trialFileTypeList = await _trialFileTypeRepository.Where(x=>x.TrialId==inDto.TrialId)
|
||||||
.WhereIf(inDto.IsAuthorizedView, x => x.IsAuthorizedView)
|
.WhereIf(inDto.IsEnable, x => x.IsEnable)
|
||||||
.OrderBy(x=>x.ShowOrder)
|
.OrderBy(x=>x.ShowOrder)
|
||||||
.ProjectTo<TrialFileTypeView>(_mapper.ConfigurationProvider)
|
.ProjectTo<TrialFileTypeView>(_mapper.ConfigurationProvider)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
List<TrialFileTypeData> result= trialFileTypeList.GroupBy(x =>new { x.ArchiveTypeEnum},(key,list)=>new TrialFileTypeData() {
|
List<TrialFileTypeData> result = new List<TrialFileTypeData>();
|
||||||
ArchiveTypeEnum= key.ArchiveTypeEnum,
|
foreach (ArchiveType type in Enum.GetValues(typeof(ArchiveType)))
|
||||||
TrialFileTypeList=list.OrderBy(y=>y.ShowOrder).ToList(),
|
{
|
||||||
}).OrderBy(x=>x.ArchiveTypeEnum).ToList();
|
result.Add(new TrialFileTypeData()
|
||||||
|
{
|
||||||
|
ArchiveTypeEnum = type,
|
||||||
|
TrialFileTypeList = trialFileTypeList.Where(x => x.ArchiveTypeEnum == type).ToList()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return new GetTrialFileTypeDataOutDto() { TrialFileTypeDataList = result };
|
return new GetTrialFileTypeDataOutDto() { TrialFileTypeDataList = result };
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
IRepository<NoneDicomStudy> _noneDicomStudyRepository,
|
IRepository<NoneDicomStudy> _noneDicomStudyRepository,
|
||||||
IRepository<VisitTask> _visitTaskRepository,
|
IRepository<VisitTask> _visitTaskRepository,
|
||||||
IRepository<Trial> _trialRepository,
|
IRepository<Trial> _trialRepository,
|
||||||
IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
|
IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
|
||||||
IRepository<ReadingNoneDicomMark> _readingNoneDicomMarkRepository,
|
IRepository<ReadingNoneDicomMark> _readingNoneDicomMarkRepository,
|
||||||
IRepository<UserLog> _userLogRepository,
|
IRepository<UserLog> _userLogRepository,
|
||||||
IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
|
IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
|
||||||
|
|
|
@ -68,7 +68,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="id"></param>
|
/// <param name="id"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost]
|
[HttpPost("{id:guid}")]
|
||||||
public async Task<IResponseOutput> DeleteTrialFileType(Guid id)
|
public async Task<IResponseOutput> DeleteTrialFileType(Guid id)
|
||||||
{
|
{
|
||||||
var success = await _readingNoneDicomMarkRepository.DeleteFromQueryAsync(t => t.Id == id, true);
|
var success = await _readingNoneDicomMarkRepository.DeleteFromQueryAsync(t => t.Id == id, true);
|
||||||
|
|
|
@ -127,9 +127,6 @@ public class TrialFileType : BaseFullAuditEntity
|
||||||
[Comment("是否确认收入项")]
|
[Comment("是否确认收入项")]
|
||||||
public bool IsConfirmRecord { get; set; }
|
public bool IsConfirmRecord { get; set; }
|
||||||
|
|
||||||
[Comment("是否授权查看")]
|
|
||||||
public bool IsAuthorizedView { get; set; }
|
|
||||||
|
|
||||||
[Comment("首次定稿日期")]
|
[Comment("首次定稿日期")]
|
||||||
public DateOnly FirstFinalDate { get; set; }
|
public DateOnly FirstFinalDate { get; set; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue