From 5cc192b317abb44c023f0e1c87451677356a05a9 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 4 Sep 2025 09:46:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ExportTumorEvaluationDto.cs | 4 ++-- .../ReadingCalculate/IRECIST1Point1CalculateService.cs | 2 +- .../Service/ReadingCalculate/MRECISTHCCCalculateService.cs | 4 ++-- .../Service/ReadingCalculate/PCWG3CalculateService.cs | 2 +- .../Service/ReadingCalculate/RECIST1Point1CalculateService.cs | 4 ++-- .../ReadingCalculate/RECIST1Point1_BMCalculateService.cs | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs index c15999979..a22430240 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs @@ -92,7 +92,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto List targets=new List(); var index = 0; - foreach (var item in VisitOne.VisitTargetInfoList) + foreach (var item in VisitList.Last().VisitTargetInfoList) { TargetInfo targetInfo = new TargetInfo() { @@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto List targets = new List(); var index = 0; - foreach (var item in VisitOne.VisitNoTargetInfoList) + foreach (var item in VisitList.Last().VisitNoTargetInfoList) { TargetInfo targetInfo = new TargetInfo() { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 503bf0d2e..321645eaa 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -270,7 +270,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 - { "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号 + { "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号 { "VisitName",visitInfo.VisitName }, //访视名称 { "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期 { "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index 440b8bddc..1944e2e3f 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -179,7 +179,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var researchProgramNo = subjectInfo.Trial.ResearchProgramNo; var subjectName = subjectInfo.ShortName; - var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty(); + var subjectCode = string.Join(",", subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).ToList()); //患者编号; @@ -442,7 +442,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 - { "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号 + { "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号 { "VisitName",visitInfo.VisitName }, //访视名称 { "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期 { "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 9649f02ca..d5b7024c2 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -206,7 +206,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 - { "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号 + { "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号 { "VisitName",visitInfo.VisitName }, //访视名称 { "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期 { "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index e7f1899a9..413722723 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -194,7 +194,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var researchProgramNo = subjectInfo.Trial.ResearchProgramNo; var subjectName = subjectInfo.ShortName; - var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty(); + var subjectCode = string.Join(",", subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).ToList()); //患者编号; @@ -457,7 +457,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 - { "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号 + { "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号 { "VisitName",visitInfo.VisitName }, //访视名称 { "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期 { "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs index 2fbee178a..0d334834e 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs @@ -190,7 +190,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var researchProgramNo = subjectInfo.Trial.ResearchProgramNo; var subjectName = subjectInfo.ShortName; - var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty(); + var subjectCode = string.Join(",", subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).ToList()); //患者编号; @@ -452,7 +452,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { "SubjectName",subjectInfo.ShortName }, //患者姓名 { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别 { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄 - { "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号 + { "SubjectCode",string.Join(",",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).ToList()) }, //患者编号 { "VisitName",visitInfo.VisitName }, //访视名称 { "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期 { "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准