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

临床数据

Uat_Study
{872297557@qq.com} 2023-01-12 13:47:03 +08:00
parent cacd825835
commit 7e64174acb
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,14 +77,7 @@ namespace IRaCIS.Application.Services
.WhereIf(indto.Id != null, x => x.Id != indto.Id) .WhereIf(indto.Id != null, x => x.Id != indto.Id)
.Where(x => x.ClinicalDataTrialSetId == indto.ClinicalDataTrialSetId && x.ReadingId == indto.ReadingId); .Where(x => x.ClinicalDataTrialSetId == indto.ClinicalDataTrialSetId && x.ReadingId == indto.ReadingId);
if (await _subjectVisitRepository.AnyAsync(x => x.Id == indto.ReadingId))
{
indto.IsVisit = true;
}
else
{
indto.IsVisit = false;
}
if (await existsQuery.AnyAsync()) if (await existsQuery.AnyAsync())
@ -92,6 +85,10 @@ namespace IRaCIS.Application.Services
return ResponseOutput.NotOk("存在同类型的临床数据"); return ResponseOutput.NotOk("存在同类型的临床数据");
} }
var clinicalDataTrialSet = (await _clinicalDataTrialSetRepository.Where(x => x.Id == indto.ClinicalDataTrialSetId).FirstOrDefaultAsync()).IfNullThrowException(); var clinicalDataTrialSet = (await _clinicalDataTrialSetRepository.Where(x => x.Id == indto.ClinicalDataTrialSetId).FirstOrDefaultAsync()).IfNullThrowException();
//subject 或者访视级别的 都是在访视传
indto.IsVisit = clinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || clinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit;
if (indto.Id == null) if (indto.Id == null)
{ {
var entity = _mapper.Map<ReadingClinicalData>(indto); var entity = _mapper.Map<ReadingClinicalData>(indto);
@ -418,7 +415,7 @@ namespace IRaCIS.Application.Services
} }
ReadModule readModule = null; ReadModule readModule = null;
if (inDto.ReadingId != null) if (inDto.IsVisit ==false)
{ {
readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId).FirstOrDefaultAsync(); readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId).FirstOrDefaultAsync();
} }
@ -519,13 +516,14 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<(List<GetReadingClinicalDataListOutDto>, object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto) public async Task<(List<GetReadingClinicalDataListOutDto>, object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto)
{ {
GetTrialClinicalDataSelectIndto getTrialClinicalDataSelectIndto = new GetTrialClinicalDataSelectIndto() var getTrialClinicalDataSelectIndto = new GetTrialClinicalDataSelectIndto()
{ {
ReadingId = inDto.ReadingId, ReadingId = inDto.ReadingId,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
IsBaseLine = inDto.IsBaseLine, IsBaseLine = inDto.IsBaseLine,
SubjectId = inDto.SubjectId, SubjectId = inDto.SubjectId,
IsVisit = inDto.IsVisit, IsVisit = inDto.IsVisit,
TrialReadingCriterionId=inDto.TrialReadingCriterionId
}; };
var clinicalDataList = await this.GetTrialClinicalDataSelect(getTrialClinicalDataSelectIndto); var clinicalDataList = await this.GetTrialClinicalDataSelect(getTrialClinicalDataSelectIndto);