From 7b1042423891c430beddf82e50d8b8cf18307e99 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 27 Jul 2023 15:40:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 131ce3167..926ad1ffa 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -470,7 +470,7 @@ namespace IRaCIS.Application.Services (x.TrialId == taskInfo.TrialId && x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum && - x.DoctorUserId == taskInfo.DoctorUserId && + //x.DoctorUserId == taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && x.TaskState == TaskState.Effect && From 3a649cfcfc7e1c0afc4bf5eacdf6e48cccc82cb8 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 27 Jul 2023 16:04:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?S-99=20=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ClinicalData/ReadingClinicalDataService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index de0d9d0b3..34f438404 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -674,7 +674,7 @@ namespace IRaCIS.Application.Services .WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId) .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId) .WhereIf(inDto.SelectIsSign, x => x.IsSign == true) - .Where(x => x.ReadingId == inDto.ReadingId || (x.SubjectId == inDto.SubjectId && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject)) + .Where(x => x.ReadingId == inDto.ReadingId) .Select(x => new GetReadingClinicalDataListOutDto() { ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, From d8ea93dcd6840da56fe9cf5670c181569c277bda Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 28 Jul 2023 13:32:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingImageTask/ReadingImageTaskService.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 926ad1ffa..d0b2994b8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1659,8 +1659,9 @@ namespace IRaCIS.Application.Services throw new BusinessValidationFailedException(_localizer["ReadingImage_Idnotcorrespond"]); } } - var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); + var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); + var criterionName = taskinfo.TrialReadingCriterion.CriterionName; switch (taskinfo.TrialReadingCriterion.CriterionType) { // 对于非靶病灶，如果状态选择为显著增大，请验证： @@ -1816,7 +1817,9 @@ namespace IRaCIS.Application.Services && x.QuestionId == inDto.QuestionId ).CountAsync()) + 1)) { - throw new BusinessValidationFailedException(_localizer["ReadingImage_MaxQuestion", questionInfo.MaxQuestionCount]); + var errormsg = _localizer["ReadingImage_MaxQuestion", questionInfo.MaxQuestionCount].Value; + errormsg = errormsg.Replace("《独立影像评估章程》", criterionName + "评估标准"); + throw new BusinessValidationFailedException(errormsg); } } @@ -1841,8 +1844,7 @@ namespace IRaCIS.Application.Services Dictionary errorMsgDic = new Dictionary() { {CriterionType.RECIST1Point1, _localizer["ReadingImage_Maxlesion", item.MaxRowCount.Value]}, - - {CriterionType.PCWG3, _localizer["ReadingImage_PCWGMaximum", item.MaxRowCount.Value]}, + {CriterionType.PCWG3, _localizer["ReadingImage_PCWGMaximum", item.MaxRowCount.Value]}, }; var rowCount = 0; if ((item.QuestionMark == QuestionMark.Part || item.QuestionMark == QuestionMark.Organ) && inDto.OrganInfoId != null) @@ -1883,6 +1885,7 @@ namespace IRaCIS.Application.Services { msg = _localizer["ReadingImage_Maximum", item.QuestionName.LanguageName(item.QuestionEnName, _userInfo.IsEn_Us), item.MaxRowCount.Value, item.MaxRowCount.Value]; + msg = msg.Replace("《独立影像评估章程》", criterionName + "评估标准"); } throw new BusinessValidationFailedException(msg); @@ -1907,6 +1910,7 @@ namespace IRaCIS.Application.Services { msg = _localizer["ReadingImage_Maximum", item.QuestionName.LanguageName(item.QuestionEnName, _userInfo.IsEn_Us), item.MaxRowCount.Value, rowCount]; + msg = msg.Replace("《独立影像评估章程》", criterionName + "评估标准"); } throw new BusinessValidationFailedException(msg);