diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 4cdec6e2b..b258cf720 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -128,11 +128,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = item.Entity as SubjectVisit; switch (GetRequestUrl()) { - case "QCOperation/ObtainOrCancelQCTask": + case "QCOperation/obtainOrCancelQCTask": type = type +"/"+ entity.IsTake.ToString(); + break; + case "QCOperation/QCPassedOrFailed": + try + { + type = type + "/" + (40 % (int)entity.AuditState).ToString(); + } + catch (Exception) + { + + + } + break; } + + var subjectCode = entity.Subject?.Code; await InsertInspection(item, type, x => new DataInspection() { @@ -207,6 +221,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common // 非Dicom foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy))) { + var entity = item.Entity as NoneDicomStudy; + switch (GetRequestUrl().ToLower()) + { + case "nonedicomstudy/addorupdatenonedicomstudy": + type = _userInfo.UserTypeShortName + "/" + type; + break; + } + await InsertInspection(item, type, x => new DataInspection() { GeneralId = x.Id, diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index ee47c9f1c..481158b9e 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -715,6 +715,10 @@ namespace IRaCIS.Core.Infra.EFCore /// public async Task SetEnum(Guid trilaid, string identification, string json) { + if (json == null||json=="null") + { + return null; + } var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification) join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType == "Dictionary"&&x.IsEnable.HasValue&& x.IsEnable.Value) on u.Id equals p.ParentId select new