Compare commits
No commits in common. "f1b943b6b0f15381c4d13bba30e89881a5d30a64" and "b1fd6230653517847660866d648a800a5fba3ad5" have entirely different histories.
f1b943b6b0
...
b1fd623065
|
@ -1221,14 +1221,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
|
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
|
||||||
|
|
||||||
// 删除病灶不删除病灶标记 所以查询question的时候 已经删除的病灶对应的标记的信息要排除
|
var tableQuestionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.TaskId).ProjectTo<TableQuestionMark>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
var rowids = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.TaskId).Select(x => x.Id).ToListAsync();
|
|
||||||
|
|
||||||
List<Guid?> rowidnull = rowids.Select(x => (Guid?)x).ToList();
|
|
||||||
|
|
||||||
var tableQuestionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.TaskId
|
|
||||||
&&x.RowId==null|| rowidnull.Contains(x.RowId)
|
|
||||||
).ProjectTo<TableQuestionMark>(_mapper.ConfigurationProvider).ToListAsync();
|
|
||||||
var qusetionList = await _readingQuestionTrialRepository
|
var qusetionList = await _readingQuestionTrialRepository
|
||||||
.Where(x => x.IsShowInDicom)
|
.Where(x => x.IsShowInDicom)
|
||||||
.WhereIf(inDto.QuestionClassify != null, x => x.QuestionClassify == inDto.QuestionClassify)
|
.WhereIf(inDto.QuestionClassify != null, x => x.QuestionClassify == inDto.QuestionClassify)
|
||||||
|
@ -2076,6 +2069,9 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
var index = await _readingCalculateService.GetDeleteLesionStatrIndex(inDto);
|
var index = await _readingCalculateService.GetDeleteLesionStatrIndex(inDto);
|
||||||
|
|
||||||
|
|
||||||
|
await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.RowId == inDto.RowId);
|
||||||
|
|
||||||
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.RowId == inDto.RowId, x => new ReadingTableQuestionAnswer()
|
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.RowId == inDto.RowId, x => new ReadingTableQuestionAnswer()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue