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

修改稽查

Uat_Study
{872297557@qq.com} 2022-12-27 17:13:44 +08:00
parent 7c5e79d39e
commit 1419b4eb3d
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -122,15 +122,6 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> 字典表 </summary> /// <summary> 字典表 </summary>
public string ForeignKeyTableName { get; set; } = String.Empty; public string ForeignKeyTableName { get; set; } = String.Empty;
@ -153,6 +144,8 @@ namespace IRaCIS.Core.Domain.Models
//未知是否有用 //未知是否有用
public bool IsConfig { get; set; } public bool IsConfig { get; set; }
public string DictionaryKey { get; set; } public string DictionaryKey { get; set; }
public bool IsShowByTrialConfig { get; set; } public bool IsShowByTrialConfig { get; set; }
public string TrialConfigRelyFieldName { get; set; } public string TrialConfigRelyFieldName { get; set; }

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

@ -180,7 +180,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
IsDistinctionInterface = isDistinctionInterface, IsDistinctionInterface = isDistinctionInterface,
TrialReadingCriterionId=entity.Id, TrialReadingCriterionId = entity.Id,
ObjectRelationParentId = x.TrialId ObjectRelationParentId = x.TrialId
@ -345,7 +345,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
IsDistinctionInterface = false, IsDistinctionInterface = false,
ObjectRelationParentId= entity.SystemCriterionId ObjectRelationParentId = entity.SystemCriterionId
}); });
@ -384,7 +384,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ObjectRelationParentId = entity.CriterionId, ObjectRelationParentId = entity.CriterionId,
TrialReadingCriterionId= entity.IsSystemCriterion==false?entity.CriterionId:null TrialReadingCriterionId = entity.IsSystemCriterion == false ? entity.CriterionId : null
}); });
@ -410,9 +410,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 项目 系统公用表 // 项目 系统公用表
//配置标准病灶类型 自动计算标识 "LesionType", "QuestionType" //配置标准 病灶类型 自动计算标识 "LesionType", "QuestionType"
if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingCriterionDictionary))) if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingCriterionDictionary)))
{ {
//系统标准设置 没有翻译的字段
if (_userInfo.RequestUrl == "ReadingQuestion/setCriterionDictionary") if (_userInfo.RequestUrl == "ReadingQuestion/setCriterionDictionary")
{ {
var type = AuditOpt.Add; var type = AuditOpt.Add;
@ -423,6 +425,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var cloneEntity = firstEntity.Clone(); var cloneEntity = firstEntity.Clone();
//查询出字典的Value ValueCN Des 保存
var dicIdList = list.Select(t => t.DictionaryId).ToList();
var selectList = await _dbContext.Dictionary.Where(x => dicIdList.Contains(x.Id)).Select(t => new { t.Id, t.Value, t.ValueCN, t.Description, t.ShowOrder }).ToListAsync();
//保证Id 唯一 //保证Id 唯一
cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.CriterionId.ToString(), firstEntity.ParentCode.ToString()); cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.CriterionId.ToString(), firstEntity.ParentCode.ToString());
@ -431,14 +438,26 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ObjectRelationParentId = x.CriterionId, ObjectRelationParentId = x.CriterionId,
TrialReadingCriterionId =x.IsSystemCriterion==false? x.CriterionId:null, TrialReadingCriterionId = x.IsSystemCriterion == false ? x.CriterionId : null,
},new {DictionaryIdList= list.Select(t=>t.DictionaryId).ToList() }); },
new
{
SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) =>
new
{
t.Value,
t.ValueCN,
t.Description,
t.ShowOrder,
u.IsBaseLineUse,
u.IsFollowVisitUse
}
).OrderBy(t => t.ShowOrder).ToList()
});
} }
} }