diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
index dddd81d80..007c0eb71 100644
--- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
@@ -42,8 +42,11 @@ namespace IRaCIS.Application.Services
var systemBasicDataQueryable = _dicRepository.Where(t => t.ParentId == null)
.WhereIf(!string.IsNullOrEmpty(basicDicQuery.Code), t => t.Code.Contains(basicDicQuery.Code!))
- .WhereIf(!string.IsNullOrEmpty(basicDicQuery.keyInfo), t => t.Description.Contains(basicDicQuery.keyInfo!)
- || t.ChildList.Any(u=>u.ValueCN.Contains(basicDicQuery.keyInfo!)) || t.ChildList.Any(u => u.Description.Contains(basicDicQuery.keyInfo!)) || t.ChildList.Any(u => u.Value.Contains(basicDicQuery.keyInfo!)))
+ .WhereIf(!string.IsNullOrEmpty(basicDicQuery.keyInfo), t => t.Description.Contains(basicDicQuery.keyInfo!)
+ || t.Code.Contains(basicDicQuery.keyInfo!)
+ || t.ChildList.Any(u=>u.ValueCN.Contains(basicDicQuery.keyInfo!))
+ || t.ChildList.Any(u => u.Description.Contains(basicDicQuery.keyInfo!))
+ || t.ChildList.Any(u => u.Value.Contains(basicDicQuery.keyInfo!)))
.WhereIf(basicDicQuery.ConfigTypeId != null, t => t.ConfigTypeId == basicDicQuery.ConfigTypeId!)
.WhereIf(basicDicQuery.DataTypeEnum != null, t => t.DataTypeEnum == basicDicQuery.DataTypeEnum)
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 4e681c5a0..55487288c 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -64,9 +64,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
).ToList(), "Deleted");
-
- //var value = data.GetType().GetProperty(item).GetValue(data);
- //entitys.Where(x=>x.Entity.is)
}
@@ -94,12 +91,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
///
public async Task InsertAddEntitys(List entitys, string type)
{
- #region 所有
- //foreach (var item in entitys)
- //{
- // await InsertInspection(item.Entity, type);
- //}
- #endregion
#region 区分
@@ -515,48 +506,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
- #region 注释代码
- ////非Dicom文件
- //foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)))
- //{
- // var entity = item.Entity as NoneDicomStudyFile;
- // var noneDicomStudy = entity.NoneDicomStudy;
- // if (noneDicomStudy == null)
- // {
- // noneDicomStudy = await _dbContext.NoneDicomStudy.FirstOrDefaultAsync(x => x.Id == entity.NoneDicomStudyId);
- // }
- // noneDicomStudy = noneDicomStudy ?? new NoneDicomStudy();
- // var fileCount = 0;
- // if (type == "Add")
- // {
- // fileCount = _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.NoneDicomStudyId).Count() + 1;
- // }
- // else if (type == "Deleted")
- // {
- // fileCount = _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.NoneDicomStudyId).Count() - 1;
- // }
- // await InsertInspection(item.Entity, type, x => new DataInspection()
- // {
- // GeneralId = x.Id,
- // TrialId = noneDicomStudy.TrialId,
- // SubjectId = noneDicomStudy.SubjectId,
- // SiteId = noneDicomStudy.SiteId,
- // SubjectVisitId = noneDicomStudy.SubjectVisitId,
-
- // }, new
- // {
- // StudyCode = noneDicomStudy.StudyCode,
- // Modality = noneDicomStudy.Modality,
- // BodyPart = noneDicomStudy.BodyPart,
- // FileCount = fileCount,
- // ImageDate = noneDicomStudy.ImageDate,
- // UpNum = 1,// 每次上传或下载一个
- // });
- //}
- #endregion
-
-
-
//一致性核查
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(CheckChallengeDialog)))
{
@@ -956,17 +905,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
-
-
- ///
- /// 获取URl参数
- ///
- ///
- //public string GetRequestUrl()
- //{
- // return _userInfo.RequestUrl;
- //}
-
///
/// 映射数据
///