diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 44e911120..e651ccf6e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1735,23 +1735,20 @@ namespace IRaCIS.Core.Application.Service.Allocation //IR申请 PM 审批 注意这里有一致性分析的申请同意 不会回退访视,在此要生成影响的访视任务 else if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.DocotorApply && (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR)) { - #region 两个IR 申请同一访视,其他人的申请记录也设置为同意 + // #region 两个IR 申请同一访视,其他人的申请记录也设置为同意 - await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId && - t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed && - t.RequestReReadingType == RequestReReadingType.DocotorApply && - t.OriginalReReadingTask.VisitTaskNum == origenalTask.VisitTaskNum && - t.Id != item.Id, u => new VisitTaskReReading() - { - RequestReReadingConfirmUserId = _userInfo.Id, - RequestReReadingResultEnum = RequestReReadingResult.Agree, - }); + // await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId && + // t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed && + // t.RequestReReadingType == RequestReReadingType.DocotorApply && + //t.OriginalReReadingTask.VisitTaskNum == origenalTask.VisitTaskNum && + //t.Id != item.Id, u => new VisitTaskReReading() + //{ + // RequestReReadingConfirmUserId = _userInfo.Id, + // RequestReReadingResultEnum = RequestReReadingResult.Agree, + //}); - - - - #endregion + // #endregion //有序阅片 diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index ce4efccb5..84dadffff 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -951,14 +951,57 @@ namespace IRaCIS.Core.Infra.EFCore.Common #region 热键 模板 个性化配置 + if (entitys.Any(x => x.Entity.GetType() == typeof(ShortcutKey))) + { + var type = AuditOpt.Add; + var list = entitys.Where(x => x.Entity.GetType() == typeof(ShortcutKey)).Select(t => t.Entity as ShortcutKey); - #endregion + + var firstEntity = list.FirstOrDefault(); + + var cloneEntity = firstEntity.Clone(); + + //保证Id 唯一 + cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.UserId.ToString(), firstEntity.CreateUserId.ToString()); + + await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO() + { + + //byzhouhang + ObjectRelationParentId = x.UserId, + + IsDistinctionInterface = false, + }, new + { + ShortcutKeyList = list, + }); + } + + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserWLTemplate))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as UserWLTemplate; + + var extraIdentification = string.Empty; + + + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + IsDistinctionInterface = false, + + ObjectRelationParentId = entity.UserId + }); + } + + + #endregion #region 附加评估 // 是否参与附加评估记录表 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectCriteriaEvaluation))) + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectCriteriaEvaluation))) { var type = GetEntityAuditOpt(item); @@ -2166,9 +2209,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = item.Entity as User; + var extraIdentification = string.Empty; + + //保存其他个性化配置 + if (_userInfo.RequestUrl == "UserWLTemplate/setAutoCutNextTask") + { + extraIdentification = "/Personalization"; + } + await InsertInspection(entity, type, x => new InspectionConvertDTO() { - IsDistinctionInterface = false + IsDistinctionInterface = false, + ExtraIndentification= extraIdentification }, new { UserRealName = entity.FullName,