IRC_NewDev
he 2024-09-26 13:27:47 +08:00
parent 9834335767
commit 1b26ed1b65
3 changed files with 9 additions and 6 deletions

View File

@ -618,22 +618,24 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
if (dicomStudyId == null) if (dicomStudyId == null)
{ {
await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId);
await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
} }
else else
{ {
await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
} }
} }
else else
{ {
await _noneDicomStudyFileReposiotry.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId); await _noneDicomStudyFileReposiotry.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId);
} }
await _noneDicomStudyFileReposiotry.SaveChangesAsync();
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }

View File

@ -671,6 +671,7 @@ namespace IRaCIS.Core.Application.Service.RC
switch (criterion.CriterionType) switch (criterion.CriterionType)
{ {
case CriterionType.IVUS: case CriterionType.IVUS:
criterion.IsReadingPeriod = false;
criterion.IsImageFilter = false; criterion.IsImageFilter = false;
criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom; criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
criterion.ImageDownloadEnum = ReadingImageDownload.Subejct; criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;

View File

@ -985,7 +985,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 匹配动脉段最小FCT // 匹配动脉段最小FCT
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = oCTFCTInfos.Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()), Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()),
Id = NewId.NextGuid(), Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id, QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
@ -1011,7 +1011,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 脂质角度平均值 // 脂质角度平均值
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
Id = NewId.NextGuid(), Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id, QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
@ -1024,7 +1024,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 脂质角度最大值 // 脂质角度最大值
tableAnswers.Add(new ReadingTableQuestionAnswer() tableAnswers.Add(new ReadingTableQuestionAnswer()
{ {
Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()), Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()),
Id = NewId.NextGuid(), Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id, QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,