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

修改

Uat_Study
he 2023-06-28 14:51:29 +08:00
parent 013f63b52f
commit 05adb5ee84
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@ namespace IRaCIS.Core.Application.Service
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<GetCRCSubjectClinicalResultDto>> GetCRCSubjectClinicalList(GetCRCSubjectClinicalInDto inDto)
public async Task<List<GetCRCSubjectClinicalOutDto>> GetCRCSubjectClinicalList(GetCRCSubjectClinicalInDto inDto)
{
await AutoAddCRCClinical(new AutoAddClinicalInDto()
@ -191,10 +191,11 @@ namespace IRaCIS.Core.Application.Service
.Where(x=>!x.IsSign)
.Include(x=>x.ClinicalDataTrialSet).Select(x=>new GetCRCSubjectClinicalOutDto() {
SubjectId=x.SubjectId,
SubjectCode=x.Subject.Code,
ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
ClinicalDataSetEnName= x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
}).OrderBy(x=>x.ClinicalDataSetName).ToListAsync();
}).OrderBy(x=>x.SubjectCode).ToListAsync();
// 一次查询报错 分两次写
clinicalData.ForEach(x =>
@ -202,28 +203,16 @@ namespace IRaCIS.Core.Application.Service
x.ClinicalDataSetEnName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us);
});
var clinicalFormData = await _clinicalFormRepository.Where(x => x.TrialId == inDto.TrialId).ToListAsync();
clinicalData.ForEach(n =>
{
n.ClinicalCount = clinicalFormData.Where(y => y.ClinicalDataTrialSetId == n.ClinicalDataTrialSetId && y.SubjectId == n.SubjectId).Count();
});
var clinicalFormData = await _clinicalFormRepository.Where(x => x.SubjectId == inDto.TrialId).ToListAsync();
subjects.ForEach(x =>
{
x.ClinicalDataList = clinicalData.Where(y => y.SubjectId == x.SubjectId).ToList();
x.ClinicalDataList.ForEach(n =>
{
n.ClinicalCount = clinicalData.Where(y => y.ClinicalDataTrialSetId == n.ClinicalDataTrialSetId && y.SubjectId == n.SubjectId).Count();
});
});
return subjects;
return clinicalData;
}
/// <summary>

2
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
View File

@ -26,6 +26,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetCRCSubjectClinicalOutDto
{
public Guid SubjectId { get; set; }
public string SubjectCode { get; set; }
public Guid ClinicalDataTrialSetId { get; set; }
public string ClinicalDataSetName { get; set; }

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

@ -80,6 +80,11 @@ namespace IRaCIS.Core.Domain.Models
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
[JsonIgnore]
[ForeignKey("ReadingId")]

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

@ -20,10 +20,13 @@ namespace IRaCIS.Core.Domain.Models
/// 受试者Id
/// </summary>
public Guid SubjectId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 检查日期
/// </summary>
/// 检查日期
/// </summary>
public DateTime CheckDate { get; set; }
/// <summary>