XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Uat_Study
he 2022-05-18 17:37:19 +08:00
parent 667cedbded
commit 00e915c26d
5 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -24,12 +24,18 @@ namespace IRaCIS.Core.Application.Services
private readonly IRepository<TrialDocument> _trialDocumentRepository; private readonly IRepository<TrialDocument> _trialDocumentRepository;
private readonly IRepository<TrialDocUserTypeConfirmedUser> _trialDocUserTypeConfirmedUserRepository;
private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
private readonly IRepository<SystemDocument> _systemDocumentRepository; private readonly IRepository<SystemDocument> _systemDocumentRepository;
public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository,
IRepository<TrialDocUserTypeConfirmedUser> trialDocUserTypeConfirmedUserRepository,
IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository
, IRepository<SystemDocument> systemDocumentRepository) , IRepository<SystemDocument> systemDocumentRepository)
{ {
_trialDocumentRepository = trialDocumentRepository; _trialDocumentRepository = trialDocumentRepository;
this._trialDocUserTypeConfirmedUserRepository = trialDocUserTypeConfirmedUserRepository;
this._systemDocConfirmedUserRepository = systemDocConfirmedUserRepository;
_systemDocumentRepository = systemDocumentRepository; _systemDocumentRepository = systemDocumentRepository;
} }
@ -408,7 +414,7 @@ namespace IRaCIS.Core.Application.Services
} }
//entity.Id = NewId.NextGuid(); //entity.Id = NewId.NextGuid();
await _repository.AddAsync(entity, true); await _trialDocumentRepository.AddAsync(entity, true);
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());
} }
else else
@ -540,7 +546,7 @@ namespace IRaCIS.Core.Application.Services
return ResponseOutput.NotOk("文件已删除或者废除,签署失败！"); return ResponseOutput.NotOk("文件已删除或者废除,签署失败！");
} }
await _repository.AddAsync(new SystemDocConfirmedUser() { ConfirmTime = DateTime.Now, ConfirmUserId = _userInfo.Id, SystemDocumentId = userConfirmCommand.DocumentId }); await _systemDocConfirmedUserRepository.AddAsync(new SystemDocConfirmedUser() { ConfirmTime = DateTime.Now, ConfirmUserId = _userInfo.Id, SystemDocumentId = userConfirmCommand.DocumentId },true);
} }
else else
{ {
@ -554,7 +560,7 @@ namespace IRaCIS.Core.Application.Services
return ResponseOutput.NotOk("文件已删除或者废除,签署失败！"); return ResponseOutput.NotOk("文件已删除或者废除,签署失败！");
} }
await _repository.AddAsync(new TrialDocUserTypeConfirmedUser() { ConfirmTime = DateTime.Now, ConfirmUserId = _userInfo.Id, TrialDocumentId = userConfirmCommand.DocumentId }); await _trialDocUserTypeConfirmedUserRepository.AddAsync(new TrialDocUserTypeConfirmedUser() { ConfirmTime = DateTime.Now, ConfirmUserId = _userInfo.Id, TrialDocumentId = userConfirmCommand.DocumentId },true);
} }
await _repository.SaveChangesAsync(); await _repository.SaveChangesAsync();
@ -574,11 +580,11 @@ namespace IRaCIS.Core.Application.Services
{ {
if (isSystemDoc) if (isSystemDoc)
{ {
await _systemDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new SystemDocument() { IsDeleted = true }); await _systemDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new SystemDocument() { IsDeleted = true },true);
} }
else else
{ {
await _trialDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new TrialDocument() { IsDeleted = true }); await _trialDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new TrialDocument() { IsDeleted = true }, true);
} }
await _systemDocumentRepository.SaveChangesAsync(); await _systemDocumentRepository.SaveChangesAsync();

10
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -15,13 +15,16 @@ namespace IRaCIS.Core.Application
public class TrialConfigService : BaseService, ITrialConfigService public class TrialConfigService : BaseService, ITrialConfigService
{ {
private readonly IRepository<Trial> _trialRepository; private readonly IRepository<Trial> _trialRepository;
private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
private readonly IEasyCachingProvider _provider; private readonly IEasyCachingProvider _provider;
public TrialConfigService(IRepository<Trial> trialRepository, public TrialConfigService(IRepository<Trial> trialRepository,
IRepository<TrialQCQuestion> trialQCQuestionRepository,
IEasyCachingProvider provider IEasyCachingProvider provider
) )
{ {
_trialRepository = trialRepository; _trialRepository = trialRepository;
this._trialQCQuestionRepository = trialQCQuestionRepository;
this._provider = provider; this._provider = provider;
} }
@ -161,7 +164,12 @@ namespace IRaCIS.Core.Application
throw new BusinessValidationFailedException("QC审核问题已被其他QC确认，不允许再次确认"); throw new BusinessValidationFailedException("QC审核问题已被其他QC确认，不允许再次确认");
} }
await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.Id, IsQCQuestionConfirmed = true },true); await _trialQCQuestionRepository.UpdatePartialFromQueryAsync(t => t.TrialId == signConfirmDTO.TrialId, x => new TrialQCQuestion
{
IsConfirm = true
});
await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.Id, IsQCQuestionConfirmed = true });
await _trialRepository.SaveChangesAsync();
} }

7
IRaCIS.Core.Domain/QC/TrialQCQuestion.cs
View File

@ -94,6 +94,13 @@ namespace IRaCIS.Core.Domain.Models
[Required] [Required]
public Guid UpdateUserId { get; set; } public Guid UpdateUserId { get; set; }
/// <summary>
/// 是否确认
/// </summary>
public bool? IsConfirm { get; set; }
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; } public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }

38
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -177,7 +177,26 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 项目文档 // 项目文档
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialDocument))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialDocument)))
{ {
await InsertInspection<TrialDocument>(item, type);
var entity = item.Entity as TrialDocument;
var userTypes = entity.NeedConfirmedUserTypeList;
if (userTypes == null)
{
userTypes = await _dbContext.TrialDocNeedConfirmedUserType.Where(x => x.TrialDocumentId == entity.Id).ToListAsync();
}
var userTypeIds = userTypes.Select(x => x.NeedConfirmUserTypeId).ToList();
var usertypeNames = await _dbContext.UserType.Where(x => userTypeIds.Contains(x.Id)).Select(x => x.UserTypeShortName).ToListAsync();
var usertypeName = string.Join(",", usertypeNames);
await InsertInspection<TrialDocument>(item, type, x => new DataInspection()
{
GeneralId = x.Id
}, new
{
NeedConfirmedUserType = usertypeName,
});
} }
// 项目中心 // 项目中心
@ -224,7 +243,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// 项目中心人员 // 项目中心人员
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteUser))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteUser)))
{ {
@ -270,8 +288,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// 中心调研表 // 中心调研表
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteSurvey))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteSurvey)))
{ {
@ -310,9 +326,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 项目问题 // 项目问题
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialQCQuestion))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialQCQuestion)))
{ {
var entity = item.Entity as TrialQCQuestion; var entity = item.Entity as TrialQCQuestion;
var isQCQuestionConfirmed = await _dbContext.Trial.Where(x => x.Id == entity.TrialId).Select(x => x.IsQCQuestionConfirmed).FirstOrDefaultAsync();
var paretName = await _dbContext.TrialQCQuestionConfigure.Where(x => x.Id == entity.ParentId).Select(x => x.QuestionName).FirstOrDefaultAsync(); var paretName = await _dbContext.TrialQCQuestionConfigure.Where(x => x.Id == entity.ParentId).Select(x => x.QuestionName).FirstOrDefaultAsync();
await InsertInspection<TrialQCQuestion>(item, type, x => new DataInspection() await InsertInspection<TrialQCQuestion>(item, type, x => new DataInspection()
{ {
@ -326,7 +340,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ParentName= paretName, ParentName= paretName,
ParentTriggerValue=entity.ParentTriggerValue, ParentTriggerValue=entity.ParentTriggerValue,
IsEnable=entity.IsEnable, IsEnable=entity.IsEnable,
IsQCQuestionConfirmed= isQCQuestionConfirmed, IsQCQuestionConfirmed= entity.IsConfirm,
}); });
} }
@ -346,8 +360,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// 检查 // 检查
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomStudy))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomStudy)))
{ {
@ -357,7 +369,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// 序列 // 序列
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomSeries))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomSeries)))
{ {
@ -508,7 +519,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// 既往手术史 // 既往手术史
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousSurgery))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousSurgery)))
{ {
@ -529,7 +539,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// 既往放疗史 // 既往放疗史
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousHistory))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousHistory)))
{ {
@ -597,7 +606,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// 质疑信息 // 质疑信息
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCChallengeDialog))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCChallengeDialog)))
{ {
@ -676,7 +684,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
// Qc 问题答案 // Qc 问题答案
if (entitys.Any(x => x.Entity.GetType() == typeof(TrialQCQuestionAnswer))) if (entitys.Any(x => x.Entity.GetType() == typeof(TrialQCQuestionAnswer)))
{ {
@ -737,6 +744,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
#region 备注
////Qc 问题答案 ////Qc 问题答案
//foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialQCQuestionAnswer))) //foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialQCQuestionAnswer)))
//{ //{
@ -754,6 +762,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//} //}
#endregion #endregion
#endregion
} }
/// <summary> /// <summary>

2
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -293,6 +293,8 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<SystemDocConfirmedUser> SystemDocConfirmedUser { get; set; } public virtual DbSet<SystemDocConfirmedUser> SystemDocConfirmedUser { get; set; }
public virtual DbSet<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserType { get; set; } public virtual DbSet<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserType { get; set; }
public virtual DbSet<TrialDocNeedConfirmedUserType> TrialDocNeedConfirmedUserType { get; set; }
public virtual DbSet<TrialDocUserTypeConfirmedUser> TrialDocUserTypeConfirmUser { get; set; } public virtual DbSet<TrialDocUserTypeConfirmedUser> TrialDocUserTypeConfirmUser { get; set; }
#endregion #endregion