修改一版
parent
bf46830b85
commit
3ca58dc9a0
|
@ -539,10 +539,10 @@ namespace IRaCIS.Application.Services
|
||||||
}
|
}
|
||||||
|
|
||||||
Dictionary<ClinicalLevel, int> keys = new Dictionary<ClinicalLevel, int>() {
|
Dictionary<ClinicalLevel, int> keys = new Dictionary<ClinicalLevel, int>() {
|
||||||
{ClinicalLevel.Subject,0 },
|
{ClinicalLevel.SubjectVisit,0 },
|
||||||
{ClinicalLevel.ImageRead,1 },
|
{ClinicalLevel.ImageRead,2 },
|
||||||
{ClinicalLevel.OncologyRead,2 },
|
{ClinicalLevel.OncologyRead,3 },
|
||||||
{ClinicalLevel.SubjectVisit,3 },
|
{ClinicalLevel.Subject,4 },
|
||||||
};
|
};
|
||||||
|
|
||||||
result.OrderBy(x => keys[x.ClinicalDataLevel]).ToList();
|
result.OrderBy(x => keys[x.ClinicalDataLevel]).ToList();
|
||||||
|
|
|
@ -52,7 +52,7 @@ namespace IRaCIS.Application.Services
|
||||||
{
|
{
|
||||||
await _readingGlobalTaskInfoRepository.BatchDeleteNoTrackingAsync(x => x.GlobalTaskId == inDto.GlobalTaskId && x.TaskId == item.VisitTaskId && x.GlobalAnswerType == answer.GlobalAnswerType && x.QuestionId == answer.QuestionId);
|
await _readingGlobalTaskInfoRepository.BatchDeleteNoTrackingAsync(x => x.GlobalTaskId == inDto.GlobalTaskId && x.TaskId == item.VisitTaskId && x.GlobalAnswerType == answer.GlobalAnswerType && x.QuestionId == answer.QuestionId);
|
||||||
await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == item.VisitTaskId && x.ReadingQuestionTrialId == answer.QuestionId
|
await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == item.VisitTaskId && x.ReadingQuestionTrialId == answer.QuestionId
|
||||||
&& x.Answer != answer.Answer && x.Answer != string.Empty
|
&& x.Answer != answer.Answer && answer.Answer != string.Empty&& answer.Answer!=null
|
||||||
, x => new ReadingTaskQuestionAnswer()
|
, x => new ReadingTaskQuestionAnswer()
|
||||||
{
|
{
|
||||||
GlobalChangeAnswer = answer.Answer,
|
GlobalChangeAnswer = answer.Answer,
|
||||||
|
@ -96,9 +96,12 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
await _readingGlobalTaskInfoRepository.BatchDeleteNoTrackingAsync(x => x.GlobalTaskId == inDto.GlobalTaskId && x.TaskId == visitTaskId && x.GlobalAnswerType == item.GlobalAnswerType && x.QuestionId == item.QuestionId);
|
await _readingGlobalTaskInfoRepository.BatchDeleteNoTrackingAsync(x => x.GlobalTaskId == inDto.GlobalTaskId && x.TaskId == visitTaskId && x.GlobalAnswerType == item.GlobalAnswerType && x.QuestionId == item.QuestionId);
|
||||||
|
|
||||||
await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == item.VisitTaskId && x.ReadingQuestionTrialId == item.QuestionId, x => new ReadingTaskQuestionAnswer()
|
await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == item.VisitTaskId && x.ReadingQuestionTrialId == answer.QuestionId
|
||||||
|
&& x.Answer != item.Answer && x.Answer != string.Empty
|
||||||
|
, x => new ReadingTaskQuestionAnswer()
|
||||||
{
|
{
|
||||||
GlobalChangeAnswer = item.Answer
|
GlobalChangeAnswer = item.Answer,
|
||||||
|
IsGlobalChange = true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue