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

修改pacs 稽查配置
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-07-02 14:24:30 +08:00
parent 32cd6e0c74
commit bdb48f93bc
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -42,7 +42,7 @@ namespace IRaCIS.Core.Application
IRepository<SubjectVisit> _subjectVisitRepository,
IRepository<Enroll> _enrollRepository,
IRepository<TrialStateChange> _trialStateChangeRepository,
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository, IRepository<TrialDicomAE> _dicomAERepository,
IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ITrialConfigService
{
@ -1150,6 +1150,9 @@ namespace IRaCIS.Core.Application
trialInfo.IsPACSConnect = trialConfig.IsPACSConnect;
trialInfo.IsTrialPACSConfirmed = trialConfig.IsTrialPACSConfirmed;
trialInfo.UpdateTime = DateTime.Now;
await _dicomAERepository.DeleteFromQueryAsync(t => t.TrialId == trialConfig.TrialId);
await _trialRepository.SaveChangesAsync();
return ResponseOutput.Ok();

1
IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs
View File

@ -102,6 +102,7 @@ namespace IRaCIS.Core.Application.Service
}
else
{
return ResponseOutput.Ok();
}

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

@ -92,7 +92,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// <param name="unitDataList">单位字典</param>
/// <param name="answer">答案</param>
/// <returns></returns>
public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList,string? answer)
public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList, string? answer)
{
if (answerType == "upload")
{
@ -104,7 +104,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
return answer + string.Empty + customUnit;
}
return answer +string.Empty + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty();
return answer + string.Empty + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty();
}
public string GetEntityAuditOpt(EntityEntry entityEntry)
{
@ -200,22 +200,21 @@ namespace IRaCIS.Core.Infra.EFCore.Common
break;
}
var trialDicomAE =await _dbContext.TrialDicomAE.Where(t => t.TrialId == entity.Id).FirstOrDefaultAsync();
//var trialDicomAE = await _dbContext.TrialDicomAE.Where(t => t.TrialId == entity.Id).FirstOrDefaultAsync();
await InsertInspection<Trial>(item.Entity as Trial, type, x => new InspectionConvertDTO()
{
TrialId = x.Id,
ExtraIndentification = extraIdentification,
}, new
{
//TrialDicList = string.Join(",", trialDics)
CalledAE = trialDicomAE?.CalledAE,
IP = trialDicomAE?.IP,
Port = trialDicomAE?.Port,
IsTestOK = trialDicomAE?.IsTestOK,
//CalledAE = trialDicomAE?.CalledAE,
//IP = trialDicomAE?.IP,
//Port = trialDicomAE?.Port,
//IsTestOK = trialDicomAE?.IsTestOK,
ImageFormatListStr = string.Join("|", entity.ImageFormatList),
StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)),
@ -384,6 +383,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<TrialDicomAE>(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false
});
}
@ -3139,7 +3139,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
(t, u) =>
new
{
Answer = Translationunit(u.AnswerType, u.Unit,u.CustomUnit, unitDataList, t.Answer),
Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
u.DictionaryCode,
u.QuestionName,
u.QuestionEnName,
@ -3247,12 +3247,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
string extraIdentification = string.Empty;
var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x=>x.ReadingQuestionCriterionTrial).FirstNotNullAsync();
var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x => x.ReadingQuestionCriterionTrial).FirstNotNullAsync();
if (readingQuestion.ReadingQuestionCriterionTrial.CriterionGroup == CriterionGroup.Nontumorous)
{
extraIdentification = "/Nontumorous";
}
await InsertInspection<ReadingTableAnswerRowInfo>(entity, type, x => new InspectionConvertDTO()
@ -3676,9 +3676,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
}
if(entity.TaskBlindName.Contains("Timepoint Ran"))
if (entity.TaskBlindName.Contains("Timepoint Ran"))
{
if(_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran")))
if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran")))
{
isDistinctionInterface = false;
extraIdentification = "/TriggerSystemBlindingName";