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

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-09-12 13:17:14 +08:00
parent 64f04a3953 38a42dc44f
commit bb38899cee
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
View File

@ -188,7 +188,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
public async Task<string> GetVisitReadReportUrl(CaGetVisitReadReportUrl inDto) public async Task<string> GetVisitReadReportUrl(CaGetVisitReadReportUrl inDto)
{ {
var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync();
if (taskinfo.ReportExportUrl != string.Empty) var iscache = false;
if (iscache && taskinfo.ReportExportUrl != string.Empty)
{ {
return taskinfo.ReportExportUrl; return taskinfo.ReportExportUrl;
} }
@ -242,7 +243,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
public async Task<string> GetTumorEvaluationReportUrl(CaGetVisitReadReportUrl inDto) public async Task<string> GetTumorEvaluationReportUrl(CaGetVisitReadReportUrl inDto)
{ {
var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync();
if (taskinfo.TumorEvaluationUrl != string.Empty) var iscache = false;
if (iscache&&taskinfo.TumorEvaluationUrl != string.Empty)
{ {
return taskinfo.TumorEvaluationUrl; return taskinfo.TumorEvaluationUrl;
} }

16
IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
View File

@ -1374,8 +1374,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
foreach (var item in recistTableAnswers) foreach (var item in recistTableAnswers)
{ {
var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault();
if (rowinfo != null)
{
item.QuestionId = rowinfo.QuestionId;
item.QuestionId = tableRowAnswers.Where(y => y.OriginalId == item.RowId).Select(x => x.QuestionId).FirstOrDefault(); var IslymphNode= recistTableAnswers.Where(x=>x.RowId== rowinfo.Id&&x.QuestionMark==QuestionMark.IsLymph).Select(x=>x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes);
var minorAxis= recistTableAnswers.Where(x => x.RowId == rowinfo.Id && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
var iSbetween15and20= minorAxis >= 15 && minorAxis < 20;
if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
{
item.Answer = string.Empty;
}
}
item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault(); item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault();
} }
@ -1386,6 +1399,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
}; };
var tableAnswers = recistTableAnswers.Select(x => new ReadingTableQuestionAnswer var tableAnswers = recistTableAnswers.Select(x => new ReadingTableQuestionAnswer
{ {
Id = NewId.NextGuid(), Id = NewId.NextGuid(),

4
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
View File

@ -1208,7 +1208,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var visitIds = siteVisitForTumorList.Select(x => x.SubjectVisitId).ToList(); var visitIds = siteVisitForTumorList.Select(x => x.SubjectVisitId).ToList();
// Dicom 用NM 非dicom 用骨扫描 (BoneScan) // Dicom 用NM 非dicom 用骨扫描 (BoneScan)
List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.ModalityForEdit == "BoneScan").Select(x => new VisitStudyTime() List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId)/* && x.ModalityForEdit == "BoneScan"*/).Select(x => new VisitStudyTime()
{ {
SubjectVisitId = x.SubjectVisitId, SubjectVisitId = x.SubjectVisitId,
StudyTime = x.StudyTime StudyTime = x.StudyTime
@ -1216,7 +1216,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}).ToListAsync(); }).ToListAsync();
visitStudies.AddRange( visitStudies.AddRange(
await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modality == "BoneScan").Select(x => new VisitStudyTime() await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) /*&& x.Modality == "BoneScan"*/).Select(x => new VisitStudyTime()
{ {
SubjectVisitId = x.SubjectVisitId, SubjectVisitId = x.SubjectVisitId,
StudyTime = x.ImageDate StudyTime = x.ImageDate