From 483c7c68e8f2abf6e4281b07a7eb3306c74c3a6b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 13 Jun 2025 09:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E7=BD=AE=E9=98=85?= =?UTF-8?q?=E7=89=87=E7=A8=BD=E6=9F=A53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/AuditingData.cs | 38 +++++++++---------- .../Common/AuditingDto.cs | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 4bb2eef65..5b8859e06 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -188,7 +188,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //TrialDicList = string.Join(",", trialDics) ImageFormatListStr = string.Join("|", entity.ImageFormatList), - StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x=>_userInfo.IsEn_Us?x.EnName:x.Name )), + StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)), CriterionNames = string.Join(",", criterionNameList.Union(memoryCriterionNameList).Distinct()), @@ -1738,11 +1738,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = item.Entity as IdentityUser; - - await InsertInspection(entity, type, x => new InspectionConvertDTO - { - IsDistinctionInterface = type == AuditOpt.Update ? true : false, - }); + + await InsertInspection(entity, type, x => new InspectionConvertDTO + { + IsDistinctionInterface = type == AuditOpt.Update ? true : false, + }); } // 项目参与人员 @@ -1777,7 +1777,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common identityUser.Phone, identityUser.OrganizationName, }); - } + } } // 项目人员 @@ -1795,7 +1795,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId); await InsertInspection(entity, type, x => new InspectionConvertDTO { - IsDistinctionInterface = false, + IsDistinctionInterface = false, TrialId = x.TrialId, ObjectRelationParentId = x.TrialId, ExtraIndentification = extraIndentification, @@ -2027,7 +2027,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common { extraIdentification = "/2"; } - + break; } @@ -3241,7 +3241,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common u.ShowOrder } ).OrderBy(t => t.ShowOrder).ToList() - },_userInfo.AuditIdentification); + }, _userInfo.AuditIdentification); ////添加/修改病灶接口 只会对单个病灶进行操作 @@ -3512,7 +3512,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //PM 申请重阅，区分不了是否有SPM参与 - if (entity.ReReadingApplyState== ReReadingApplyState.TrialGroupHaveApplyed) + if (entity.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed) { //var hasSPM = _dbContext.VisitTaskReReading.Any(t => t.OriginalReReadingTaskId == entity.Id); @@ -3577,7 +3577,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common break; - case "ReadingImageTask/resetReadingTask/VisitTask/Update": + case "ReadingImageTask/resetReadingTask": //跳转阅片结果需要该参数 obj.IsReadingReset = true; @@ -3609,7 +3609,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //增加进入阅片中的稽查 //重置阅片也会从待阅片 变为阅片中，因为复制病灶依赖这个改变 - if(obj.IsReadingReset == false) + if (obj.IsReadingReset != true) { if (entity.ReadingTaskState == ReadingTaskState.Reading) { @@ -3621,11 +3621,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common } } - + if (entity.IsReadClinicalData == true) { - if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.IsReadClinicalData ==false)) + if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.IsReadClinicalData == false)) { isDistinctionInterface = false; extraIdentification = "/ReadClinicalData"; @@ -3752,7 +3752,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common /// 表达式 /// 其他对象 /// - public async Task InsertInspection(T entityObj, string type, Expression> expression = null, object otherItem = null,string auditIdentification = "") where T : Entity + public async Task InsertInspection(T entityObj, string type, Expression> expression = null, object otherItem = null, string auditIdentification = "") where T : Entity { InspectionConvertDTO inspection = new InspectionConvertDTO(); @@ -3979,7 +3979,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common /// 获取稽查记录的标识符 部分业务会进行特殊处理 /// /// - public string GetInspectionRecordIdentification(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false,string auditIdentification="") + public string GetInspectionRecordIdentification(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false, string auditIdentification = "") { //var entityType = _dbContext.Model.FindEntityType(entityObj.GetType()); //var tableName = entityType.GetTableName(); @@ -3998,11 +3998,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common //自定义 标识后面 补充由代码上层的 extraIdentification 附加 if (isSelfDefine) { - result= $"{_userInfo.RequestUrl}/{entityTypeName}"; + result = $"{_userInfo.RequestUrl}/{entityTypeName}"; } else { - result= $"{_userInfo.RequestUrl}/{entityTypeName}/{type}"; + result = $"{_userInfo.RequestUrl}/{entityTypeName}/{type}"; } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs index d3424d9c8..f093bc9a4 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs @@ -63,7 +63,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common public string SelectResult { get; set; } - public bool IsReadingReset { get;set; } + public bool? IsReadingReset { get;set; } } public class InspectionConvertDTO : DataInspection {