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

修改字典查询

Uat_Study
hang 2022-05-31 13:57:58 +08:00
parent e2f5f8a36a
commit e033291dee
2 changed files with 5 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -42,8 +42,11 @@ namespace IRaCIS.Application.Services
var systemBasicDataQueryable = _dicRepository.Where(t => t.ParentId == null) var systemBasicDataQueryable = _dicRepository.Where(t => t.ParentId == null)
.WhereIf(!string.IsNullOrEmpty(basicDicQuery.Code), t => t.Code.Contains(basicDicQuery.Code!)) .WhereIf(!string.IsNullOrEmpty(basicDicQuery.Code), t => t.Code.Contains(basicDicQuery.Code!))
.WhereIf(!string.IsNullOrEmpty(basicDicQuery.keyInfo), t => t.Description.Contains(basicDicQuery.keyInfo!) .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!))) || 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.ConfigTypeId != null, t => t.ConfigTypeId == basicDicQuery.ConfigTypeId!)
.WhereIf(basicDicQuery.DataTypeEnum != null, t => t.DataTypeEnum == basicDicQuery.DataTypeEnum) .WhereIf(basicDicQuery.DataTypeEnum != null, t => t.DataTypeEnum == basicDicQuery.DataTypeEnum)

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

@ -64,9 +64,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
).ToList(), "Deleted"); ).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
/// <param name="entitys"></param> /// <param name="entitys"></param>
public async Task InsertAddEntitys(List<EntityEntry> entitys, string type) public async Task InsertAddEntitys(List<EntityEntry> entitys, string type)
{ {
#region 所有
//foreach (var item in entitys)
//{
// await InsertInspection<TrialUser>(item.Entity, type);
//}
#endregion
#region 区分 #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<NoneDicomStudyFile>(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))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(CheckChallengeDialog)))
{ {
@ -956,17 +905,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// <summary>
/// 获取URl参数
/// </summary>
/// <returns></returns>
//public string GetRequestUrl()
//{
// return _userInfo.RequestUrl;
//}
/// <summary> /// <summary>
/// 映射数据 /// 映射数据
/// </summary> /// </summary>