修改稽查
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
088143fb70
commit
3b4cb52fab
|
@ -2179,13 +2179,13 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var markquestionId = inDto.QuestionMarkInfoList.Select(y => (Guid?)y.QuestionId).ToList();
|
var markquestionId = inDto.QuestionMarkInfoList.Select(y => (Guid?)y.QuestionId).ToList();
|
||||||
|
|
||||||
List<Guid?> needDeleteMarkQuestonIds = inDto.Answers.Where(x => x.Answer == string.Empty).Select(x => (Guid?)x.Id).ToList();
|
List<Guid?> needDeleteMarkQuestonIds = inDto.Answers.Where(x => x.Answer == string.Empty).Select(x => (Guid?)x.Id).ToList();
|
||||||
|
var needDeleteMarkQuestionIds = questionList.Except(markquestionId).ToList();
|
||||||
switch (taskInfo.TrialReadingCriterion.CriterionType)
|
switch (taskInfo.TrialReadingCriterion.CriterionType)
|
||||||
{
|
{
|
||||||
|
|
||||||
case CriterionType.SelfDefine:
|
case CriterionType.SelfDefine:
|
||||||
// 先找到需要删除的
|
// 先找到需要删除的
|
||||||
var needDeleteMarkQuestionIds = questionList.Except(markquestionId).ToList();
|
|
||||||
foreach (var item in needDeleteMarkQuestionIds)
|
foreach (var item in needDeleteMarkQuestionIds)
|
||||||
{
|
{
|
||||||
// 对于要删除的标记不能删除 要与问题解绑
|
// 对于要删除的标记不能删除 要与问题解绑
|
||||||
|
@ -2223,21 +2223,19 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
case CriterionType.Lugano2014:
|
case CriterionType.Lugano2014:
|
||||||
|
|
||||||
//await _readingTaskQuestionMarkRepository.BatchUpdateNoTrackingAsync(x =>
|
// 先找到需要删除的
|
||||||
//(x.QuestionType == QuestionType.SplenicTopPosition || x.QuestionType == QuestionType.SplenicBottomPosition) &&
|
|
||||||
//x.VisitTaskId == inDto.VisitTaskId && needDeleteMarkQuestonIds.Contains(x.QuestionId), x => new ReadingTaskQuestionMark()
|
foreach (var item in needDeleteMarkQuestionIds)
|
||||||
//{
|
{
|
||||||
// PicturePath = string.Empty,
|
// 对于要删除的标记不能删除 要与问题解绑
|
||||||
// MeasureData = string.Empty,
|
// 但是对于一个标记绑定多个问题的情况 相当于是要删除掉这条信息
|
||||||
//});
|
var questionMark = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == item).FirstOrDefaultAsync();
|
||||||
|
if (questionMark != null)
|
||||||
|
{
|
||||||
|
await _readingTaskQuestionMarkRepository.DeleteAsync(questionMark);
|
||||||
|
}
|
||||||
|
|
||||||
//await _readingTaskQuestionMarkRepository.BatchUpdateNoTrackingAsync(x =>
|
}
|
||||||
//(x.QuestionType == QuestionType.LiverSUVmax || x.QuestionType == QuestionType.MediastinumSUVmax) &&
|
|
||||||
//x.VisitTaskId == inDto.VisitTaskId && needDeleteMarkQuestonIds.Contains(x.QuestionId), x => new ReadingTaskQuestionMark()
|
|
||||||
//{
|
|
||||||
// OtherPicturePath = string.Empty,
|
|
||||||
// OtherMeasureData = string.Empty,
|
|
||||||
//});
|
|
||||||
|
|
||||||
await addOrEditmark(inDto.QuestionMarkInfoList);
|
await addOrEditmark(inDto.QuestionMarkInfoList);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue