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

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

Test_IRC_Net8
he 2025-12-03 15:13:41 +08:00
parent 8de44fb7b3 647aee010a
commit 7e39692cc4
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -2216,7 +2216,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
private void CopyForms(VisitTask newTask, VisitTask origenalTask) private void CopyForms(VisitTask newTask, VisitTask origenalTask)
{ {
newTask.IsCopyLesionAnswer = true;
//自定义 //自定义
//var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); //var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();

12
IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
View File

@ -261,7 +261,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
SourceSubjectVisitId = t.SourceSubjectVisitId, SourceSubjectVisitId = t.SourceSubjectVisitId,
VisitTaskNum = t.VisitTaskNum, VisitTaskNum = t.VisitTaskNum,
VisitNum = t.VisitTaskNum, VisitNum = t.VisitTaskNum,
VisitName = t.SourceSubjectVisit.VisitName, VisitName = t.TaskBlindName, //t.SourceSubjectVisit.VisitName,
EarliestScanDate = t.SourceSubjectVisit.EarliestScanDate, EarliestScanDate = t.SourceSubjectVisit.EarliestScanDate,
LatestScanDate = t.SourceSubjectVisit.LatestScanDate, LatestScanDate = t.SourceSubjectVisit.LatestScanDate,
VisitTaskId = t.Id, VisitTaskId = t.Id,
@ -763,7 +763,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
#endregion #endregion
#region rs 处理部分 只有非基线 #region rs 处理部分 只有非基线处理PD
//非基线 //非基线
if (task.VisitNum > 0) if (task.VisitNum > 0)
@ -773,18 +773,24 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
List<RSValueEnum> rsValueList = new List<RSValueEnum>(); List<RSValueEnum> rsValueList = new List<RSValueEnum>();
var overallPD = "";
if (criterion.CriterionType == CriterionType.RECIST1Point1) if (criterion.CriterionType == CriterionType.RECIST1Point1)
{ {
rsValueTypeIndex = Get_Resist_RS_VisitFixed_Index(task, questionAnswer); rsValueTypeIndex = Get_Resist_RS_VisitFixed_Index(task, questionAnswer);
rsValueList = RESIST_RSFixed.RSValueList; rsValueList = RESIST_RSFixed.RSValueList;
overallPD = "PD";
} }
else if (criterion.CriterionType == CriterionType.Lugano2014) else if (criterion.CriterionType == CriterionType.Lugano2014)
{ {
rsValueTypeIndex = Get_Lugano_RS_VisitFixed_Index(task, questionAnswer); rsValueTypeIndex = Get_Lugano_RS_VisitFixed_Index(task, questionAnswer);
rsValueList = Lugano_RSFixed.RSValueList; rsValueList = Lugano_RSFixed.RSValueList;
overallPD = "PMD/PD";
} }
@ -812,7 +818,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
rs.IsOveralResponse = true; rs.IsOveralResponse = true;
rs.IsOverallResponsePD = rs.RespondEfficacyAssessment == "PD"; rs.IsOverallResponsePD = rs.RespondEfficacyAssessment == overallPD;
} }

2
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -772,7 +772,7 @@ namespace IRaCIS.Core.Application.Image.QA
var query = _inspectionFileRepository.Where(t => t.TrialId == inQuery.TrialId && (t.CheckState == EDCCheckState.Success || t.CheckState == EDCCheckState.Failed)) var query = _inspectionFileRepository.Where(t => t.TrialId == inQuery.TrialId && (t.CheckState == EDCCheckState.Success || t.CheckState == EDCCheckState.Failed))
.ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider); .ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider);
return await query.ToPagedListAsync(inQuery); return await query.ToPagedListAsync(inQuery,nameof(GetUserUploadFileDto.CreateTime));
} }