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

修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-06-12 15:32:17 +08:00
parent 0cb74296c3
commit ce11788878
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,11 +165,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm": case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm":
extraIdentification = $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}"; extraIdentification = $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}";
break; break;
case "configTrialBasicInfo/ConfigTrialProcessInfoConfirm": case "configTrialBasicInfo/ConfigTrialProcessInfoConfirm":
extraIdentification = $"/{oldentity.IsTrialProcessConfirmed.ToString()}"; extraIdentification = $"/{oldentity.IsTrialProcessConfirmed.ToString()}";
break; break;
case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm": case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm":
extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}"; extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}";
break; break;
@ -245,11 +245,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//项目流程确认 //项目流程确认
|| _userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm" || _userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm"
//确认医学审核问题 //确认医学审核问题
|| _userInfo.RequestUrl == "ReadingMedicineQuestion/ConfirmReadingMedicineQuestion" || _userInfo.RequestUrl == "ReadingMedicineQuestion/ConfirmReadingMedicineQuestion"
//阅片单元 保存阅片规则 //阅片单元 保存阅片规则
|| _userInfo.RequestUrl == "TrialConfig/setCriterionReadingInfo" || _userInfo.RequestUrl == "TrialConfig/setCriterionReadingInfo"
|| _userInfo.RequestUrl == "configTrialBasicInfo/TrialReadingInfoSign") || _userInfo.RequestUrl == "configTrialBasicInfo/TrialReadingInfoSign")
{ {
@ -284,7 +284,32 @@ namespace IRaCIS.Core.Infra.EFCore.Common
.Select(t => new { t.AdditionalAssessmentType, t.IsSelected }).ToListAsync(); .Select(t => new { t.AdditionalAssessmentType, t.IsSelected }).ToListAsync();
await InsertInspection<ReadingQuestionCriterionTrial>(entity, type, x => new InspectionConvertDTO() var oncologyAssessIdsStr = string.Empty;
var allList = new List<ReadingTrialCriterionDictionary>();
if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingTrialCriterionDictionary)))
{
allList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTrialCriterionDictionary))
.Select(t => t.Entity as ReadingTrialCriterionDictionary).ToList().Where(x=>
x.CriterionId== entity.Id &&
x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess).ToList();
}
else
{
allList=await _dbContext.ReadingTrialCriterionDictionary.Where(x =>
x.CriterionId == entity.Id &&
x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess).ToListAsync();
}
//查询出字典的Value ValueCN Des 保存
var diclistOncologyAssess = allList.Select(t => t.DictionaryId).ToList();
var selectList = await _dbContext.Dictionary.Where(x => diclistOncologyAssess.Contains(x.Id)).Select(t => t.ValueCN).ToListAsync();
oncologyAssessIdsStr = string.Join(",", selectList);
await InsertInspection<ReadingQuestionCriterionTrial>(entity, type, x => new InspectionConvertDTO()
{ {
IsDistinctionInterface = isDistinctionInterface, IsDistinctionInterface = isDistinctionInterface,
@ -296,7 +321,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}, new }, new
{ {
EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty, OncologyAssessIdsStr= oncologyAssessIdsStr,
EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty,
AdditionalAssessmentTypeList = addtionalAssesementList AdditionalAssessmentTypeList = addtionalAssesementList
}); });
} }