From cc1ae5548003e728a3baa6c6839e19e274fabba2 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 18 Dec 2025 10:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 7 ++-
.../Common/AuditingData.cs | 56 ++++++++++++++++---
.../Common/AuditingDto.cs | 13 +++++
3 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 8fa7fefea..2bbfe2ad7 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1336,6 +1336,11 @@
OCT 导表模型
+
+
+ 斑块到血管开口的距离
+
+
靶段
@@ -2738,7 +2743,7 @@
-
+
IR 上传任务 nonedicom 列表 后处理的数据UploadedFileCount不能排序 --new
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index ffb0417ec..4b95997ad 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -2819,7 +2819,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//ObjectRelationParentId2 = x.IsVisit == false?x.ReadingId:null
},
new { FileCountViewStr = config?.ClinicalDataLevel == ClinicalLevel.Subject && config?.ClinicalUploadType == ClinicalUploadType.Table ? "NA" : entity.FileCount.ToString() },
- extraIndentification
+ new OtherInspection() {
+ AuditIdentification= extraIndentification
+ }
);
}
@@ -3611,7 +3613,31 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TableQuestionName = tableQuestionName,
Answer = answer,
LiverSegmentation = liverSegmentation,
- }, string.Empty, customPrefix);
+ },
+
+ new OtherInspection()
+ {
+ CustomPrefix = customPrefix
+ });
+ }
+
+
+ foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)))
+ {
+ var type = GetEntityAuditOpt(item);
+
+ var entity = item.Entity as ReadingNoneDicomMark;
+
+
+
+ await InsertInspection(entity, type, x => new InspectionConvertDTO()
+ {
+ IsDistinctionInterface = false,
+
+ }, new
+ {
+
+ });
}
//保存影像质量 多条记录，只记录一条稽查
@@ -3785,8 +3811,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}).OrderBy(t => t.ShowOrder).ToList()
,
TableQuestionAndAnswerList = tableQuesionAndAnswerList
- }, _userInfo.AuditIdentification
- );
+ }, new OtherInspection()
+ {
+ AuditIdentification = _userInfo.AuditIdentification
+ }
+ );
}
@@ -3841,7 +3870,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
QuestionName = questionName,
RowMark = rowMark,
TableQuestionName = _userInfo.IsEn_Us ? tableQuestion.QuestionEnName : tableQuestion.QuestionName,
- }, _userInfo.AuditIdentification);
+ }, new OtherInspection()
+ {
+ AuditIdentification = _userInfo.AuditIdentification
+ });
}
}
@@ -3963,7 +3995,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
u.ShowOrder
}
).OrderBy(t => t.ShowOrder).ToList()
- }, _userInfo.AuditIdentification);
+ }, new OtherInspection()
+ {
+ AuditIdentification = _userInfo.AuditIdentification
+ });
////添加/修改病灶接口 只会对单个病灶进行操作
@@ -4200,11 +4235,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// 额外标识
/// 自定义前缀
///
- public async Task InsertInspection(T entityObj, string type, Expression> expression = null, object otherItem = null, string auditIdentification = "", string customPrefix = "") where T : Entity
+ public async Task InsertInspection(T entityObj, string type, Expression> expression = null, object otherItem = null, OtherInspection? otherInspection=null) where T : Entity
{
InspectionConvertDTO inspection = new InspectionConvertDTO();
-
+ if (otherInspection == null)
+ {
+ otherInspection = new OtherInspection() { };
+ }
if (expression != null)
{
@@ -4218,7 +4256,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var generalId = (inspection.GeneralId != null && inspection.GeneralId != Guid.Empty) ? inspection.GeneralId : entityObj.Id;
inspection.GeneralId = generalId;
- inspection.Identification = GetInspectionRecordIdentification(entityObj, type, inspection.IsDistinctionInterface, inspection.IsSelfDefine, auditIdentification, customPrefix) + inspection.ExtraIndentification;
+ inspection.Identification = GetInspectionRecordIdentification(entityObj, type, inspection.IsDistinctionInterface, inspection.IsSelfDefine, otherInspection.AuditIdentification, otherInspection.CustomPrefix) + inspection.ExtraIndentification;
//将实体对象属性 映射到稽查实体
MapEntityPropertyToAuditEntity(entityObj, inspection);
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
index 5fb1a9ff3..6cc067ee4 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
@@ -79,6 +79,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
public bool? IsReadingReset { get; set; }
}
+
+ public class OtherInspection
+ {
+ ///
+ /// 自定义后缀
+ ///
+ public string AuditIdentification { get; set; }=string.Empty;
+
+ ///
+ /// 自定义前缀
+ ///
+ public string CustomPrefix { get; set; } = string.Empty;
+ }
public class InspectionConvertDTO : DataInspection
{
///