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

稽查调整
continuous-integration/drone/push Build is running Details

Test_IRC_Net8
he 2025-12-18 10:30:04 +08:00
parent 1bc3e77c1a
commit cc1ae55480
3 changed files with 66 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1336,6 +1336,11 @@
OCT 导表模型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.DOST">
<summary>
斑块到血管开口的距离
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.TARGETV">
<summary>靶段</summary>
</member>
@ -2738,7 +2743,7 @@
<param name="_dicomStudyRepository"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetIRUploadTaskNoneDicomStudyList(IRaCIS.Core.Application.Contracts.IRUploadStudyQuery)">
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetIRUploadTaskNoneDicomStudyList(IRaCIS.Core.Application.Contracts.INoneDicomStudyService,IRaCIS.Core.Application.Contracts.IRUploadStudyQuery)">
<summary>
IR 上传任务 nonedicom 列表 后处理的数据UploadedFileCount不能排序 --new
</summary>

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

@ -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<ReadingNoneDicomMark>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
}, new
{
});
}
//保存影像质量 多条记录，只记录一条稽查
@ -3785,7 +3811,10 @@ 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
/// <param name="auditIdentification">额外标识</param>
/// <param name="customPrefix">自定义前缀</param>
/// <returns></returns>
public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> expression = null, object otherItem = null, string auditIdentification = "", string customPrefix = "") where T : Entity
public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> 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);

13
IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
View File

@ -79,6 +79,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
public bool? IsReadingReset { get; set; }
}
public class OtherInspection
{
/// <summary>
/// 自定义后缀
/// </summary>
public string AuditIdentification { get; set; }=string.Empty;
/// <summary>
/// 自定义前缀
/// </summary>
public string CustomPrefix { get; set; } = string.Empty;
}
public class InspectionConvertDTO : DataInspection
{
/// <summary>