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

S-45

Uat_Study
he 2023-07-12 10:31:58 +08:00
parent 83f419bff1
commit b3386c20ab
6 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
View File

@ -128,7 +128,14 @@ namespace IRaCIS.Core.Application.Service
var clinicalDataList =await _readingClinicalDataRepository
.WhereIf(inDto.SubjectId != null, x => x.SubjectId == inDto.SubjectId)
.Where(x =>x.TrialId==inDto.TrialId&&x.ClinicalDataTrialSet.UploadRole== UploadRole.CRC).IgnoreAutoIncludes().ToListAsync();
.Where(x =>x.TrialId==inDto.TrialId&&x.ClinicalDataTrialSet.UploadRole== UploadRole.CRC)
.Select(x=>new
{
ClinicalDataTrialSetId=x.ClinicalDataTrialSetId,
SubjectId=x.SubjectId,
x.ReadingId,
}).ToListAsync();
List<ReadingClinicalData> readingClinicalDatas = new List<ReadingClinicalData>();
@ -184,12 +191,12 @@ namespace IRaCIS.Core.Application.Service
}).ToList());
});
await _readingClinicalDataRepository.AddRangeAsync(readingClinicalDatas);
await _readingClinicalDataRepository.SaveChangesAsync();
await _readingClinicalDataRepository.AddRangeAsync(readingClinicalDatas);
await _readingClinicalDataRepository.SaveChangesAsync();
}
}
/// <summary>
/// 获取CRC受试者临床数据

2
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -197,7 +197,7 @@ namespace IRaCIS.Application.Services
Path = x.ClinicalDataTrialSet.Path,
IsBlind = x.IsBlind,
IsComplete = x.IsComplete,
ClinicalFromList=x.ClinicalFormList.Select(y=> new ClinicalFromData() {
ClinicalFromList=x.Subject.ClinicalFormList.Where(y=>y.ReadingId==x.ReadingId).Select(y=> new ClinicalFromData() {
CheckDate=y.CheckDate,
ClinicalFormId=y.Id
}).ToList(),

6
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs
View File

@ -96,11 +96,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<ReadingClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
/// <summary>
/// 临床数据表单
/// </summary>
[JsonIgnore]
public List<ClinicalForm> ClinicalFormList { get; set; }
}

4
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs
View File

@ -55,8 +55,8 @@ namespace IRaCIS.Core.Domain.Models
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
[JsonIgnore]
public ReadingClinicalData ReadingClinicalData { get; set; }
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
}

2
IRaCIS.Core.Domain/Visit/Subject.cs
View File

@ -121,6 +121,8 @@ namespace IRaCIS.Core.Domain.Models
public Guid? DeleteUserId { get; set; }
public bool IsReReadingOrBackInfluenceAnalysis { get; set; }
[JsonIgnore]
public List<ClinicalForm> ClinicalFormList { get; set; }
public Guid? ClaimUserId { get; set; }

22
IRaCIS.Core.Infra.EFCore/EntityConfigration/ClinicalFromConfigration.cs
View File

@ -9,19 +9,19 @@ using System.Threading.Tasks;
namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
{
public class ClinicalFromConfigration : IEntityTypeConfiguration<ClinicalForm>
{
//public class ClinicalFromConfigration : IEntityTypeConfiguration<ClinicalForm>
//{
public void Configure(EntityTypeBuilder<ClinicalForm> builder)
{
builder
.HasOne(s => s.ReadingClinicalData)
.WithMany(c => c.ClinicalFormList)
.HasForeignKey(s => new { s.SubjectId, s.ReadingId })
.HasPrincipalKey(c => new { c.SubjectId, c.ReadingId });
}
// public void Configure(EntityTypeBuilder<ClinicalForm> builder)
// {
// builder
// .HasOne(s => s.ReadingClinicalData)
// .WithMany(c => c.ClinicalFormList)
// .HasForeignKey(s => new { s.SubjectId, s.ReadingId })
// .HasPrincipalKey(c => new { c.SubjectId, c.ReadingId });
// }
}
//}
}