拷贝表单
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
447d3fc36f
commit
b7c9abca02
|
@ -1850,6 +1850,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public bool ExistsManual { get; set; }
|
public bool ExistsManual { get; set; }
|
||||||
|
|
||||||
|
public bool IsBaseLine { get; set; }
|
||||||
|
|
||||||
public ReadingCategory ReadingCategory { get; set; }
|
public ReadingCategory ReadingCategory { get; set; }
|
||||||
|
|
||||||
public decimal VisitNum { get; set; }
|
public decimal VisitNum { get; set; }
|
||||||
|
|
|
@ -86,7 +86,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public Guid NewSystemCriterionId { get; set; }
|
public Guid NewSystemCriterionId { get; set; }
|
||||||
|
|
||||||
public bool IsCopyQuestion { get; set; }
|
//public bool IsCopyQuestion { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class EditCriterionDictionaryInDto
|
public class EditCriterionDictionaryInDto
|
||||||
|
|
|
@ -22,8 +22,9 @@ namespace IRaCIS.Core.Application.Service
|
||||||
IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
|
IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
|
||||||
IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository,
|
IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository,
|
||||||
IRepository<Dictionary> _dictionaryRepository,
|
IRepository<Dictionary> _dictionaryRepository,
|
||||||
|
IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCodeRepository,
|
||||||
IReadingImageTaskService _iReadingImageTaskService,
|
IReadingImageTaskService _iReadingImageTaskService,
|
||||||
IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository,
|
IRepository<ReadingSystemCriterionDictionary> _readingSystemCriterionDictionaryRepository,
|
||||||
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
|
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
|
||||||
IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
|
IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
|
||||||
IRepository<Trial> _trialRepository,
|
IRepository<Trial> _trialRepository,
|
||||||
|
@ -939,8 +940,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<IResponseOutput> CopySystemCriterionData(CopySystemCriterionDataInDto inDto)
|
public async Task<IResponseOutput> CopySystemCriterionData(CopySystemCriterionDataInDto inDto)
|
||||||
{
|
{
|
||||||
if (inDto.IsCopyQuestion)
|
|
||||||
{
|
|
||||||
var newSystemQuestionList = await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == inDto.SourceSystemCriterionId)
|
var newSystemQuestionList = await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == inDto.SourceSystemCriterionId)
|
||||||
.ProjectTo<ReadingQuestionSystemData>(_mapper.ConfigurationProvider).ToListAsync();
|
.ProjectTo<ReadingQuestionSystemData>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
newSystemQuestionList.ForEach(x =>
|
newSystemQuestionList.ForEach(x =>
|
||||||
|
@ -993,22 +993,49 @@ namespace IRaCIS.Core.Application.Service
|
||||||
}
|
}
|
||||||
await _readingTableQuestionSystemRepository.BatchDeleteNoTrackingAsync(x => x.SystemCriterionId == inDto.NewSystemCriterionId);
|
await _readingTableQuestionSystemRepository.BatchDeleteNoTrackingAsync(x => x.SystemCriterionId == inDto.NewSystemCriterionId);
|
||||||
await _readingTableQuestionSystemRepository.AddRangeAsync(needAddTableDatas);
|
await _readingTableQuestionSystemRepository.AddRangeAsync(needAddTableDatas);
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
|
||||||
else
|
#region 器官
|
||||||
|
var organData = await _organInfoRepository.Where(x => x.SystemCriterionId == inDto.SourceSystemCriterionId).ToListAsync();
|
||||||
|
|
||||||
|
organData.ForEach(x =>
|
||||||
{
|
{
|
||||||
var organData = await _organInfoRepository.Where(x => x.SystemCriterionId == inDto.SourceSystemCriterionId).ToListAsync();
|
x.Id = NewId.NextGuid();
|
||||||
|
x.SystemCriterionId = inDto.NewSystemCriterionId;
|
||||||
|
});
|
||||||
|
await _organInfoRepository.BatchDeleteNoTrackingAsync(x => x.SystemCriterionId == inDto.NewSystemCriterionId);
|
||||||
|
await _organInfoRepository.AddRangeAsync(organData);
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 字典Code
|
||||||
|
var dictionaryCodes = await _systemCriterionDictionaryCodeRepository.Where(x => x.SystemCriterionId == inDto.SourceSystemCriterionId).ToListAsync();
|
||||||
|
|
||||||
|
dictionaryCodes.ForEach(x =>
|
||||||
|
{
|
||||||
|
x.Id = NewId.NextGuid();
|
||||||
|
x.SystemCriterionId = inDto.NewSystemCriterionId;
|
||||||
|
});
|
||||||
|
await _systemCriterionDictionaryCodeRepository.BatchDeleteNoTrackingAsync(x => x.SystemCriterionId == inDto.NewSystemCriterionId);
|
||||||
|
await _systemCriterionDictionaryCodeRepository.AddRangeAsync(dictionaryCodes);
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 字典
|
||||||
|
|
||||||
|
|
||||||
|
var criterionDictionaries = await _readingSystemCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.SourceSystemCriterionId).ToListAsync();
|
||||||
|
|
||||||
|
criterionDictionaries.ForEach(x =>
|
||||||
|
{
|
||||||
|
x.Id = NewId.NextGuid();
|
||||||
|
x.CriterionId = inDto.NewSystemCriterionId;
|
||||||
|
});
|
||||||
|
await _readingSystemCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.NewSystemCriterionId);
|
||||||
|
await _readingSystemCriterionDictionaryRepository.AddRangeAsync(criterionDictionaries);
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
organData.ForEach(x =>
|
|
||||||
{
|
|
||||||
x.Id = NewId.NextGuid();
|
|
||||||
x.SystemCriterionId = inDto.NewSystemCriterionId;
|
|
||||||
});
|
|
||||||
await _organInfoRepository.BatchDeleteNoTrackingAsync(x => x.SystemCriterionId == inDto.NewSystemCriterionId);
|
|
||||||
await _organInfoRepository.AddRangeAsync(organData);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3171,6 +3171,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
task.ExistsManual = (await GetManualList(new GetManualListInDto() { TrialId = visitTaskInfo.TrialId })).Count > 0;
|
task.ExistsManual = (await GetManualList(new GetManualListInDto() { TrialId = visitTaskInfo.TrialId })).Count > 0;
|
||||||
task.ReadingTaskState = visitTaskInfo.ReadingTaskState;
|
task.ReadingTaskState = visitTaskInfo.ReadingTaskState;
|
||||||
task.IsShowStudyName= trialInfo.IsShowStudyName;
|
task.IsShowStudyName= trialInfo.IsShowStudyName;
|
||||||
|
task.IsBaseLine = isBaseLine;
|
||||||
task.IsExistUnprocessedFeedback = await _userFeedBackRepository.AnyAsync(x => x.VisitTaskId == task.VisitTaskId && x.State == 0);
|
task.IsExistUnprocessedFeedback = await _userFeedBackRepository.AnyAsync(x => x.VisitTaskId == task.VisitTaskId && x.State == 0);
|
||||||
// 添加默认答案
|
// 添加默认答案
|
||||||
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
||||||
|
|
Loading…
Reference in New Issue