From 2f50c17320c428091e71c50b3f2966fe3e4a9203 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 25 May 2023 16:12:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 10 +++-
.../Common/AuditingData.cs | 58 ++++++++++++++++++-
2 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index d767e1375..ecb34cf08 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1439,6 +1439,12 @@
+
+
+ 获取第一次转变访视任务Id
+
+
+
@@ -7432,9 +7438,9 @@
满足RECISTPD
-
+
- 本次访视SOD增加不小于5mm
+ 本次访视SOD与触发iRECIST访视相比本次访视SOD增加不小于5mm
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,
From 544ceefef7b39e090dcf803790951b6d0f033745 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 26 May 2023 11:24:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E9=98=85?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Allocation/VisitTaskService.cs | 25 ++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
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
//有序阅片