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-06-06 14:24:25 +08:00
parent c7a310c1ad
commit 1f67d24abc
3 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -79,7 +79,7 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public List<StudyName> StudyNameList { get; set; }
public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
@ -1040,7 +1040,7 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialSPMConfigCommand
{
public Guid Id { get; set; }
public Guid Id { get; set; }
[Comment("SPM 参与中心调研")]
public bool IsSPMJoinSiteSurvey { get; set; }
@ -1184,6 +1184,9 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialBodyPartView
{
public bool IsStudyUse { get; set; }
public string Code { get; set; }

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

@ -503,8 +503,9 @@ namespace IRaCIS.Core.Application
&& x.ReadingCriterionPageId == null)
.ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
return (result, new {
ReadingVersionEnum= trialCriterion.ReadingVersionEnum
return (result, new
{
ReadingVersionEnum = trialCriterion.ReadingVersionEnum
});
}
@ -585,7 +586,7 @@ namespace IRaCIS.Core.Application
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
{
ReadingToolList=inDto.ReadingToolList,
ReadingToolList = inDto.ReadingToolList,
IsImageFilter = inDto.IsImageFilter,
ImageDownloadEnum = inDto.ImageDownloadEnum,
ImageUploadEnum = inDto.ImageUploadEnum,
@ -1334,7 +1335,35 @@ namespace IRaCIS.Core.Application
/// <returns></returns>
public async Task<IResponseOutput<List<TrialBodyPartView>>> GetTrialBodyPartList(Guid trialId)
{
var list = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialBodyPartList).Select(t => new TrialBodyPartView() { Code = t.Code, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN, Id = t.Id, IsHandAdd = t.IsHandAdd }).OrderBy(t=>t.Name).ToListAsync();
var list = await _trialRepository.Where(t => t.Id == trialId)
.SelectMany(t => t.TrialBodyPartList)
.Select(t => new TrialBodyPartView() { Code = t.Code, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN, Id = t.Id, IsHandAdd = t.IsHandAdd })
.OrderBy(t => t.Name).ToListAsync();
var useBodyPart = _trialRepository.Where(t => t.Id == trialId).Select(t => new
{
DicomBodyPartList = t.StudyList.Where(t => t.BodyPartForEdit != "")
.Select(c => c.BodyPartForEdit)
.Distinct(),
NoneDicomBodyPartList = t.NoneDicomStudyList.Where(t => t.BodyPart != "")
.Select(c => c.BodyPart)
.Distinct(),
}).FirstOrDefault();
foreach (var item in list)
{
var useBodyPartList = new List<string>();
if (useBodyPart != null)
{
useBodyPartList = useBodyPart.DicomBodyPartList.Union(useBodyPart.NoneDicomBodyPartList).Distinct().ToList();
}
item.IsStudyUse = useBodyPartList.Any(t => t == item.Name);
}
return ResponseOutput.Ok(list);
}
@ -1417,7 +1446,7 @@ namespace IRaCIS.Core.Application
[HttpPost]
public async Task<IResponseOutput> UpdateTrialStudyNameList(UpdateTrialStudyNameListInDto inDto)
{
var trial = await _trialRepository.FirstOrDefaultAsync(x => x.Id == inDto.TrialId);

3
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -48,6 +48,9 @@ public partial class Trial : BaseFullDeleteAuditEntity
public List<Subject> SubjectList { get; set; } = new List<Subject>();
[JsonIgnore]
public List<SubjectVisit> SubjectVisitList { get; set; } = new List<SubjectVisit>();
[JsonIgnore]
public List<NoneDicomStudy> NoneDicomStudyList { get; set; }
[JsonIgnore]
public List<DicomStudy> StudyList { get; set; } = new List<DicomStudy>();
[JsonIgnore]