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

Test_IRC_Net8
hang 2025-07-07 16:09:10 +08:00
parent e1755eb11a
commit 4c60a32c7e
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -328,6 +328,8 @@ namespace IRaCIS.Core.Application.Service
trial.DeclarationTypes = $"|{string.Join('|', updateModel.DeclarationTypeEnumList.Select(x => ((int)x).ToString()).ToList())}|"; trial.DeclarationTypes = $"|{string.Join('|', updateModel.DeclarationTypeEnumList.Select(x => ((int)x).ToString()).ToList())}|";
trial.AttendedReviewerTypes = $"|{string.Join('|', updateModel.AttendedReviewerTypeEnumList.Select(x => ((int)x).ToString()).ToList())}|"; trial.AttendedReviewerTypes = $"|{string.Join('|', updateModel.AttendedReviewerTypeEnumList.Select(x => ((int)x).ToString()).ToList())}|";
trial.UpdateTime = DateTime.Now;
var success = await _trialRepository.SaveChangesAsync(); var success = await _trialRepository.SaveChangesAsync();
//维护CRO Sponsor //维护CRO Sponsor

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

@ -169,6 +169,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var memoryClinicalDataSetNameList = entitys.Where(x => x.Entity.GetType() == typeof(ClinicalDataTrialSet)).Select(t => t.Entity as ClinicalDataTrialSet) var memoryClinicalDataSetNameList = entitys.Where(x => x.Entity.GetType() == typeof(ClinicalDataTrialSet)).Select(t => t.Entity as ClinicalDataTrialSet)
.Where(t => t.TrialId == entity.Id && t.IsConfirm).Select(t => _userInfo.IsEn_Us ? t.ClinicalDataSetEnName : t.ClinicalDataSetName).ToList(); .Where(t => t.TrialId == entity.Id && t.IsConfirm).Select(t => _userInfo.IsEn_Us ? t.ClinicalDataSetEnName : t.ClinicalDataSetName).ToList();
//项目字典TrialDictionary
var memoryModalityIdList = entitys.Where(x => x.Entity.GetType() == typeof(TrialDictionary)).Select(t => t.Entity as TrialDictionary)
.Where(t => t.TrialId == entity.Id && t.KeyName == StaticData.Modality).Select(t => t.DictionaryId).ToList();
var modalityList = _dbContext.Dictionary.Where(t => memoryModalityIdList.Contains(t.Id)).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).ToList();
Guid id = entity.Id; Guid id = entity.Id;
var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new
@ -210,6 +217,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ExtraIndentification = extraIdentification, ExtraIndentification = extraIdentification,
}, new }, new
{ {
ModalityListStr = string.Join(",", modalityList),
//TrialDicList = string.Join(",", trialDics) //TrialDicList = string.Join(",", trialDics)
//CalledAE = trialDicomAE?.CalledAE, //CalledAE = trialDicomAE?.CalledAE,
@ -224,7 +232,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ClinicalDataSetNames = string.Join(",", clinicalDataSetNameList.Union(memoryClinicalDataSetNameList).Distinct().OrderBy(t => t)), ClinicalDataSetNames = string.Join(",", clinicalDataSetNameList.Union(memoryClinicalDataSetNameList).Distinct().OrderBy(t => t)),
}); ; });
} }
#region 已修改 #region 已修改
@ -2017,7 +2025,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
if(_userInfo.RequestUrl== "NoneDicomStudy/deleteNoneDicomStudy"|| _userInfo.RequestUrl == "NoneDicomStudy/deleteNoneDicomStudyFile") if (_userInfo.RequestUrl == "NoneDicomStudy/deleteNoneDicomStudy" || _userInfo.RequestUrl == "NoneDicomStudy/deleteNoneDicomStudyFile")
{ {
isDistinctionInterface = false; isDistinctionInterface = false;
@ -2176,8 +2184,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
SubjectVisitId = noneDicomStudy.SubjectVisitId, SubjectVisitId = noneDicomStudy.SubjectVisitId,
SubjectId = noneDicomStudy.SubjectId, SubjectId = noneDicomStudy.SubjectId,
ObjectRelationParentId = x.VisitTaskId, ObjectRelationParentId = x.VisitTaskId,
ObjectRelationParentId2=x.NoneDicomStudyId, ObjectRelationParentId2 = x.NoneDicomStudyId,
ObjectRelationParentId3=x.OriginNoneDicomStudyId, ObjectRelationParentId3 = x.OriginNoneDicomStudyId,
ExtraIndentification = extraIdentification ExtraIndentification = extraIdentification
}, new }, new
{ {
@ -2614,9 +2622,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
if (entity.ReadingScope == ReadingScopeEnum.Site) if (entity.ReadingScope == ReadingScopeEnum.Site)
{ {
var siteIds = entity.ReadingPeriodSites.Select(t => t.TrialSiteId).ToList(); var siteIds = entity.ReadingPeriodSites.Select(t => t.TrialSiteId).ToList();
if(siteIds == null || siteIds.Count == 0) if (siteIds == null || siteIds.Count == 0)
{ {
siteIds= await _dbContext.ReadingPeriodSite.Where(c => c.ReadingPeriodSetId== entity.Id).Select(t => t.TrialSiteId).ToListAsync(); siteIds = await _dbContext.ReadingPeriodSite.Where(c => c.ReadingPeriodSetId == entity.Id).Select(t => t.TrialSiteId).ToListAsync();
} }
var nameList = _dbContext.TrialSite.Where(c => c.TrialId == entity.TrialId && siteIds.Contains(c.Id)).Select(t => t.TrialSiteCode).ToList(); var nameList = _dbContext.TrialSite.Where(c => c.TrialId == entity.TrialId && siteIds.Contains(c.Id)).Select(t => t.TrialSiteCode).ToList();
@ -3137,12 +3145,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionMark)).Select(x=>x.Entity as ReadingTaskQuestionMark).FirstOrDefault(); var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionMark)).Select(x => x.Entity as ReadingTaskQuestionMark).FirstOrDefault();
var markName= string.Empty; var markName = string.Empty;
if (mark != null) if (mark != null)
{ {
markName=mark.OrderMarkName; markName = mark.OrderMarkName;
} }
await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO() await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO()
@ -3158,8 +3166,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}, new }, new
{ {
MarkName= markName, MarkName = markName,
PicturePath= mark!=null?mark.PicturePath:string.Empty, PicturePath = mark != null ? mark.PicturePath : string.Empty,
QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, QuestionAnswerList = taskQuestionAnswerList.Join(quesionList,
t => t.ReadingQuestionTrialId, t => t.ReadingQuestionTrialId,
u => u.QuestionId, u => u.QuestionId,
@ -3193,16 +3201,16 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var tableQuestionAnswer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(x => x.Entity as ReadingTableQuestionAnswer) var tableQuestionAnswer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(x => x.Entity as ReadingTableQuestionAnswer)
.Where(x => x.RowId == entity.RowId && x.TableQuestionId == entity.TableQuestionId).FirstOrDefault(); .Where(x => x.RowId == entity.RowId && x.TableQuestionId == entity.TableQuestionId).FirstOrDefault();
var answer=string.Empty; var answer = string.Empty;
if (tableQuestionAnswer != null) if (tableQuestionAnswer != null)
{ {
answer = tableQuestionAnswer.Answer; answer = tableQuestionAnswer.Answer;
} }
var rowMark= await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync(); var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
var tableQuestionName = await _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us? x.QuestionEnName:x.QuestionName).FirstOrDefaultAsync(); var tableQuestionName = await _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync();
var questionName = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync(); var questionName = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync();
var liverSegmentation = await _dbContext.ReadingTableQuestionAnswer.Where(x => x.RowId == entity.RowId && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.liverSegmentation).Select(x => x.Answer).FirstOrDefaultAsync(); var liverSegmentation = await _dbContext.ReadingTableQuestionAnswer.Where(x => x.RowId == entity.RowId && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.liverSegmentation).Select(x => x.Answer).FirstOrDefaultAsync();
@ -3219,7 +3227,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TableQuestionName = tableQuestionName, TableQuestionName = tableQuestionName,
Answer = answer, Answer = answer,
LiverSegmentation = liverSegmentation, LiverSegmentation = liverSegmentation,
},_userInfo.AuditIdentification); }, _userInfo.AuditIdentification);
} }