修改一版

This commit is contained in:
he
2022-05-16 15:50:59 +08:00
parent 052c849270
commit e1d4402b85
7 changed files with 102 additions and 44 deletions
@@ -38,6 +38,8 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public bool IsHaveSubjectAge { get; set; } = false;
public bool IsTrialBasicLogicConfirmed { get; set; } = false;
/// <summary>
/// 出组后计划外访视名称
@@ -87,6 +89,11 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public bool IsImageConsistencyVerification { get; set; } = false;
/// <summary>
/// 流程是否确认
/// </summary>
public bool IsTrialProcessConfirmed { get; set; } = false;
/// <summary>
/// 1 Mint、2 PACS
/// </summary>
@@ -125,6 +132,11 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public bool IsEnrollementQualificationConfirm { get; set; } = false;
/// <summary>
/// 流程配置是否确认
/// </summary>
public bool IsTrialUrgentConfirmed { get; set; } = false;
public bool IsUrgent { get; set; }
public bool IsPDProgressView { get; set; }
@@ -106,6 +106,11 @@ namespace IRaCIS.Core.Application
/// <returns></returns>
public async Task<IResponseOutput> TrialConfigSignatureConfirm(SignConfirmDTO signConfirmDTO)
{
//var currentEntry = _trialRepository._dbContext.ChangeTracker.Entries().Where(x => x.Entity.GetType() == typeof(Trial)).ToList();
//currentEntry.ForEach(x =>
//{
// x.State = EntityState.Detached;
//});
if (!await _trialRepository.AnyAsync(t => t.Id == signConfirmDTO.TrialId && (t.TrialStatusStr == StaticData.TrialInitializing|| t.TrialStatusStr == StaticData.TrialOngoing)))
{
@@ -114,15 +119,15 @@ namespace IRaCIS.Core.Application
if (signConfirmDTO.SignCode == ((int)SignEnum.TrialLogicConfim).ToString())
{
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialBasicLogicConfirmed = true });
await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialBasicLogicConfirmed = true });
}
else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialProcessConfim).ToString())
{
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialProcessConfirmed = true });
await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialProcessConfirmed = true });
}
else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialUrgentConfim).ToString())
{
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialUrgentConfirmed = true });
await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { IsTrialUrgentConfirmed = true });
}
else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirm).ToString())
@@ -158,7 +163,7 @@ namespace IRaCIS.Core.Application
throw new BusinessValidationFailedException("父问题的序号要比子问题序号小,请确认");
}
await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.Id, IsQCQuestionConfirmed = true });
await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.Id, IsQCQuestionConfirmed = true });
}
@@ -184,8 +189,9 @@ namespace IRaCIS.Core.Application
var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId);
if (trialInfo == null) return Null404NotFound(trialInfo);
_mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
return ResponseOutput.Ok(await _repository.SaveChangesAsync());
}
@@ -328,7 +334,7 @@ namespace IRaCIS.Core.Application
if (trialInfo == null) return Null404NotFound(trialInfo);
_mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
return ResponseOutput.Ok(await _repository.SaveChangesAsync());
@@ -368,6 +374,8 @@ namespace IRaCIS.Core.Application
_mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
return ResponseOutput.Ok(await _repository.SaveChangesAsync());
}