Compare commits
No commits in common. "6c103b577c735c1b6294bd8d2ffcbaef957be048" and "3b4cb52fab25961a46d06c622c77a4470988bfa5" have entirely different histories.
6c103b577c
...
3b4cb52fab
|
|
@ -489,8 +489,7 @@ namespace IRaCIS.Core.Application.Image.QA
|
|||
|
||||
var secondReviewTime = inDto.SecondReviewTime != null ? (DateTime)inDto.SecondReviewTime : trialConfirmTime == null ? DateTime.Now : (DateTime)trialConfirmTime;
|
||||
|
||||
if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview) || (inDto.CurrentQCEnum == CurrentQC.SecondReview && secondReviewTime.AddSeconds(1) < trialConfirmTime)
|
||||
|| (sv.AuditState >= AuditStateEnum.PrimaryQCPassed && inDto.CurrentQCEnum==CurrentQC.First)) //1QC通过时,这个时候看1qc答案
|
||||
if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview) || (inDto.CurrentQCEnum == CurrentQC.SecondReview && secondReviewTime.AddSeconds(1) < trialConfirmTime))
|
||||
{
|
||||
|
||||
//之前质控完的,+二次复核完的,都要从答案表中取 二次复核完的还需要加时间
|
||||
|
|
|
|||
|
|
@ -782,16 +782,6 @@ namespace IRaCIS.Core.Application.Image.QA
|
|||
//_mapper.Map(qcQuestionAnswerCommands, questionAnswerList);
|
||||
#endregion
|
||||
|
||||
//可能还有新增的问题
|
||||
|
||||
var needAddList = qcQuestionAnswerCommands.Where(t => t.Id == null).ToList();
|
||||
var addlist = _mapper.Map<List<TrialQCQuestionAnswer>>(needAddList);
|
||||
|
||||
|
||||
|
||||
addlist.ForEach(t => { t.TrialId = trialId; t.SubjectVisitId = subjectVisitId; t.CurrentQCEnum = currentQCType; t.QCProcessEnum = trialQCProcess; t.SecondReviewTime = currentQCType == CurrentQC.SecondReview ? trialConfirmTime : null; });
|
||||
|
||||
await _trialQCQuestionAnswerRepository.AddRangeAsync(addlist);
|
||||
|
||||
|
||||
return ResponseOutput.Ok(await _trialQCQuestionAnswerRepository.SaveChangesAsync());
|
||||
|
|
|
|||
Loading…
Reference in New Issue