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

修改

Uat_Study
he 2022-12-22 16:47:32 +08:00 committed by {872297557@qq.com}
parent 4a2143e549
commit d59dbc8369
13 changed files with 131 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
View File

@ -44,6 +44,7 @@
<None Remove="Resources\en-US.json" />
<None Remove="Resources\zh-CN.json" />
<None Remove="Service\Allocation\TaskConsistentRuleService.cs~RF1603d47.TMP" />
<None Remove="Service\Reading\ReadingImageTask\ReadingImageTaskService.cs~RF2f9323.TMP" />
<None Remove="Service\Reading\ReadingImageTask\ReadingJudgeTaskService.cs~RF198afd23.TMP" />
</ItemGroup>

42
IRaCIS.Core.Application/Resources/en-US.json
View File

@ -186,9 +186,49 @@
"TimeTooLow": "当前访视检查时间不能小于该访视之前检查的时间，请核对检查数据是否有误",
"SomeoneLoading": "当前有人正在上传归档该检查!",
"VisitEnd": "受试者访视结束，不允许上传!",
"DICOMUploaded{0}{1}{2}{3}": "{0}: This DICOM images have been uploaded and allocate to the {1} of the subject {2} (Study ID: {3}), which cannot continue to upload and assign it to others."
"DICOMUploaded{0}{1}{2}{3}": "{0}: This DICOM images have been uploaded and allocate to the {1} of the subject {2} (Study ID: {3}), which cannot continue to upload and assign it to others.",
//StudyService
//SystemAnonymizationService
//ReadingGlobalTaskService
"ReadingGlobal_NotGlobal": "The current task is not a global reading task",
//ReadingImageTaskService
"ReadingImage_NotVisit": "The current task is not a visit task",
"ReadingImage_CantSplit": "This is currently a baseline task and cannot be split and combined",
"ReadingImage_BeSigned": "The current task has been signed!",
"ReadingImage_Beinvalid": "The current task is invalid!",
"ReadingImage_NotaTask": "The combined lesions were not the same visiting task",
"ReadingImage_DeleteError": "The current lesion splits into other lesions or other lesions merge into the current lesion, and deletion fails",
"ReadingImage_Idnotcorrespond": "InstanceId and SeriesId do not correspond !",
"ReadingImage_Twice": "The same question is passed in twice",
"ReadingImage_MaxQuestion": "The maximum number of problems currently submitted is {0}!",
"ReadingImage_Maxlesion": "According to the relevant rules of RECIST1.1, the number of target lesions in the same organ does not exceed {0}!",
"ReadingImage_Maximum": "Problems {0} The maximum number of the same problems is {1}, and {2} already exist",
"ReadingImage_RequiredQuestion": "The answer to the required question {0} is empty or not saved",
"ReadingImage_ClinicalRead": "Clinical data not read!",
"ReadingImage_IDMust": "When there is no task Id, the standard Id must be passed",
"ReadingImage_TaskFinish": "The current subject has completed all the task of reading the film!",
"ReadingImage_NeedRest": "You have read the video continuously for 2 hours. Please take a 20-minute rest before reading the video again.",
//ReadingJudgeTaskService
"ReadingJudge_SouceIdNull": "The SouceId of the current referee global task is null",
//ReadingOncologyTaskService
"ReadingOncology_TaskError": "The current task is not an oncology task",
"ReadingOncology_Abnormal": "Abnormal, the referee result is null",
//ReadingCalculate
"ReadingCalculate_Abnormal": "The PCWG3 standard configuration is abnormal!",
"ReadingCalculate_NoMarker": "Lesion {0} no marker exists,",
"ReadingCalculate_StatusIsEmpty": "Lesion {0} status is empty,",
"ReadingCalculate_NoMarkerEmpty": "Lesion {0} is unmarked and the status is empty,",
"ReadingCalculate_NoDeveloped": "The current standard calculation is not well developed!",
//ReadingMedicalReviewService
"MedicalReview_invalid": "The medical audit was invalid and the operation failed",
"MedicalReview_SaveQuestion": "Please save the medical review question first",
"MedicalReview_NeedSave": "Save the question and conclusion first",
"MedicalReview_NotClosed": "Dialogue not closed"
}

41
IRaCIS.Core.Application/Resources/zh-CN.json
View File

@ -188,9 +188,48 @@
"TimeTooLow": "当前访视检查时间不能小于该访视之前检查的时间，请核对检查数据是否有误",
"SomeoneLoading": "当前有人正在上传归档该检查!",
"VisitEnd": "受试者访视结束，不允许上传!",
"DICOMUploaded{0}{1}{2}{3}": "{0}:此DICOM图片已上传并分配给课题{2}(研究ID:{3})的{1}，课题{2}无法继续上传并分配给他人。"
"DICOMUploaded{0}{1}{2}{3}": "{0}:此DICOM图片已上传并分配给课题{2}(研究ID:{3})的{1}，课题{2}无法继续上传并分配给他人。",
//StudyService
//SystemAnonymizationService
//ReadingGlobalTaskService
"ReadingGlobal_NotGlobal": "当前任务不是全局阅片任务",
//ReadingImageTaskService
"ReadingImage_NotVisit": "当前任务不是访视任务",
"ReadingImage_CantSplit": "当前是基线任务,无法拆分和合并病灶",
"ReadingImage_BeSigned": "当前任务已经签名！",
"ReadingImage_Beinvalid": "当前任务已失效！",
"ReadingImage_NotaTask": "合并的病灶并非同一个访视任务",
"ReadingImage_DeleteError": "当前病灶分裂出其他病灶或者其他病灶合并到了当前病灶,删除失败",
"ReadingImage_Idnotcorrespond": "InstanceId和SeriesId不对应！",
"ReadingImage_Twice": "相同问题传入两次",
"ReadingImage_MaxQuestion": "当前提交问题最大问题数为{0}个！",
"ReadingImage_Maxlesion": "按照RECIST1.1的相关规则，同一器官的靶病灶数量不超过{0}个，请确认",
"ReadingImage_Maximum": "问题{0}最大相同问题数为{1},当前已存在{2}条",
"ReadingImage_RequiredQuestion": "必填问题{0}的答案为空或未保存",
"ReadingImage_ClinicalRead": "临床数据未阅读！",
"ReadingImage_IDMust": "当没有任务Id的时候，标准Id必传",
"ReadingImage_TaskFinish": "当前受试者此次阅片任务已全部完成！",
"ReadingImage_NeedRest": "您已连续阅片2个小时，请休息20分钟后，再继续阅片。",
//ReadingJudgeTaskService
"ReadingJudge_SouceIdNull": "当前裁判的全局任务的SouceId为null",
//ReadingOncologyTaskService
"ReadingOncology_TaskError": "当前任务不是肿瘤学任务",
"ReadingOncology_Abnormal": "异常，裁判结果为null",
//ReadingCalculate
"ReadingCalculate_Abnormal": "PCWG3标准配置异常!",
"ReadingCalculate_NoMarker": "病灶{0}不存在标记,",
"ReadingCalculate_StatusIsEmpty": "病灶{0}状态为空,",
"ReadingCalculate_NoMarkerEmpty": "病灶{0}未做标记，且状态为空,",
"ReadingCalculate_NoDeveloped": "当前标准计算未开发好!",
//ReadingMedicalReviewService
"MedicalReview_invalid": "该医学审核无效,操作失败",
"MedicalReview_SaveQuestion": "请先保存医学审核问题",
"MedicalReview_NeedSave": "请先保存问题和结论",
"MedicalReview_NotClosed": "对话未关闭"
}

18
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -425,7 +425,7 @@ namespace IRaCIS.Core.Application.Service
var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
if (medicalReviewInfo.IsInvalid)
{
throw new BusinessValidationFailedException("该医学审核无效,操作失败");
throw new BusinessValidationFailedException(_localizer["MedicalReview_invalid"]);
}
await _readingMedicineQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.TaskMedicalReviewId == inDto.TaskMedicalReviewId);
@ -468,11 +468,11 @@ namespace IRaCIS.Core.Application.Service
var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
if (medicalReviewInfo.IsInvalid)
{
throw new BusinessValidationFailedException("该医学审核无效,操作失败");
throw new BusinessValidationFailedException(_localizer["MedicalReview_invalid"]);
}
if ((await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.SaveQuestionTime).FirstOrDefaultAsync()) == null)
{
return ResponseOutput.NotOk("请先保存医学审核问题");
return ResponseOutput.NotOk(_localizer["MedicalReview_SaveQuestion"]);
}
await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{
@ -547,7 +547,7 @@ namespace IRaCIS.Core.Application.Service
var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
if (medicalReviewInfo.IsInvalid)
{
throw new BusinessValidationFailedException("该医学审核无效,操作失败");
throw new BusinessValidationFailedException(_localizer["MedicalReview_invalid"]);
}
var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
@ -580,7 +580,7 @@ namespace IRaCIS.Core.Application.Service
var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
if (medicalReviewInfo.IsInvalid)
{
throw new BusinessValidationFailedException("该医学审核无效,操作失败");
throw new BusinessValidationFailedException(_localizer["MedicalReview_invalid"]);
}
var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
if (inDto.IsApplyHeavyReading??false)
@ -663,7 +663,7 @@ namespace IRaCIS.Core.Application.Service
var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
if (medicalReviewInfo.IsInvalid)
{
throw new BusinessValidationFailedException("该医学审核无效,操作失败");
throw new BusinessValidationFailedException(_localizer["MedicalReview_invalid"]);
}
var taskmedicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => new
@ -677,13 +677,13 @@ namespace IRaCIS.Core.Application.Service
if (taskmedicalReview.SaveQuestionTime == null || taskmedicalReview.SaveConclusionTime==null)
{
throw new BusinessValidationFailedException("请先保存问题和结论");
throw new BusinessValidationFailedException(_localizer["MedicalReview_NeedSave"]);
}
if (taskmedicalReview.IsHaveQuestion&&!taskmedicalReview.IsClosedDialog)
{
throw new BusinessValidationFailedException("对话未关闭");
throw new BusinessValidationFailedException(_localizer["MedicalReview_NotClosed"]);
}
@ -708,7 +708,7 @@ namespace IRaCIS.Core.Application.Service
var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
if (medicalReviewInfo.IsInvalid)
{
throw new BusinessValidationFailedException("该医学审核无效,操作失败");
throw new BusinessValidationFailedException(_localizer["MedicalReview_invalid"]);
}
await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -87,7 +87,7 @@ namespace IRaCIS.Application.Services
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
if (taskInfo.ReadingCategory != ReadingCategory.Global)
{
throw new BusinessValidationFailedException("当前任务不是全局阅片任务");
throw new BusinessValidationFailedException(_localizer["ReadingGlobal_NotGlobal"]);
}
GetGlobalReadingInfoOutDto result = new GetGlobalReadingInfoOutDto()
{
@ -186,7 +186,7 @@ namespace IRaCIS.Application.Services
new GlobalQuestionInfo()
{
Answer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).Select(x => x.Answer).FirstOrDefault() ?? string.Empty,
QuestionName = "是否同意访视整体评估",
QuestionName = "",
Type = "input",
GlobalAnswerType=GlobalAnswerType.AgreeOrNot,
GlobalReadingShowType= GlobalReadingShowType.AllShow,

36
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -311,12 +311,12 @@ namespace IRaCIS.Application.Services
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
if (taskinfo.ReadingCategory != ReadingCategory.Visit)
{
throw new BusinessValidationFailedException("当前任务不是访视任务");
throw new BusinessValidationFailedException(_localizer["ReadingImage_NotVisit"]);
}
if (await _subjectVisitRepository.AnyAsync(x => x.Id == taskinfo.SourceSubjectVisitId && x.IsBaseLine))
{
throw new BusinessValidationFailedException("当前是基线任务,无法拆分和合并病灶");
throw new BusinessValidationFailedException(_localizer["ReadingImage_CantSplit"]);
}
}
@ -332,13 +332,13 @@ namespace IRaCIS.Application.Services
{
if (await _visitTaskRepository.AnyAsync(x => x.Id == visitTaskid && x.ReadingTaskState == ReadingTaskState.HaveSigned))
{
throw new BusinessValidationFailedException($"当前任务已经签名！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_BeSigned"]);
}
if (await _visitTaskRepository.AnyAsync(x => x.Id == visitTaskid && x.TaskState != TaskState.Effect))
{
throw new BusinessValidationFailedException($"当前任务已失效！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_Beinvalid"]);
}
}
@ -813,7 +813,7 @@ namespace IRaCIS.Application.Services
if (rowsInfo.Count() != 2)
{
throw new BusinessValidationFailedException("合并的病灶并非同一个访视任务");
throw new BusinessValidationFailedException(_localizer["ReadingImage_NotaTask"]);
}
@ -938,7 +938,7 @@ namespace IRaCIS.Application.Services
if (await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.SplitRowId == deleteRowInfo.Id && x.MergeRowId == deleteRowInfo.Id))
{
throw new BusinessValidationFailedException($"当前病灶分裂出其他病灶或者其他病灶合并到了当前病灶,删除失败");
throw new BusinessValidationFailedException(_localizer["ReadingImage_DeleteError"]);
}
var index = await _readingCalculateService.GetDeleteLesionStatrIndex(inDto);
@ -1072,7 +1072,7 @@ namespace IRaCIS.Application.Services
{
if (!(await _dicomInstanceRepository.AnyAsync(x => x.Id == inDto.InstanceId && x.SeriesId == inDto.SeriesId)))
{
throw new BusinessValidationFailedException($"InstanceId和SeriesId不对应！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_Idnotcorrespond"]);
}
}
@ -1090,7 +1090,7 @@ namespace IRaCIS.Application.Services
if (tableQuestionIdGroup.Any(x => x.Count > 1))
{
throw new BusinessValidationFailedException($"相同问题传入两次！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_Twice"]);
}
if (inDto.RowIndex % 1 == 0)
@ -1104,7 +1104,7 @@ namespace IRaCIS.Application.Services
&& x.QuestionId == inDto.QuestionId
).CountAsync()) + 1))
{
throw new BusinessValidationFailedException($"当前提交问题最大问题数为{questionInfo.MaxQuestionCount}！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_MaxQuestion", questionInfo.MaxQuestionCount]);
}
}
@ -1123,7 +1123,7 @@ namespace IRaCIS.Application.Services
Dictionary<CriterionType, string> errorMsgDic = new Dictionary<CriterionType, string>()
{
{CriterionType.RECIST1Pointt1, $"按照RECIST1.1的相关规则，同一器官的靶病灶数量不超过{item.MaxRowCount.Value}个，请确认！"},
{CriterionType.RECIST1Pointt1, _localizer["ReadingImage_Maxlesion", item.MaxRowCount.Value]},
};
string msg = string.Empty;
try
@ -1133,7 +1133,7 @@ namespace IRaCIS.Application.Services
catch (Exception)
{
msg = $"问题{item.QuestionName}最大相同问题数为{item.MaxRowCount.Value},当前已存在{rowCount}条！";
msg = _localizer["ReadingImage_Maximum", item.QuestionName, item.MaxRowCount.Value, rowCount] ;
}
throw new BusinessValidationFailedException(msg);
@ -1353,7 +1353,7 @@ namespace IRaCIS.Application.Services
if (readingQuestionList.Count() > 0)
{
throw new BusinessValidationFailedException($" 必填问题{string.Join(',', readingQuestionList.Select(x => x.QuestionName))}的答案为空或未保存");
throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName))]);
}
return ResponseOutput.Ok(true);
}
@ -1380,7 +1380,7 @@ namespace IRaCIS.Application.Services
if (readingQuestionList.Count() > 0)
{
throw new BusinessValidationFailedException($" 必填问题{string.Join(',', readingQuestionList.Select(x => x.QuestionName))}的答案为空或未保存");
throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName))]);
}
await _readingCalculateService.VerifyVisitTaskQuestions(inDto);
@ -1412,7 +1412,7 @@ namespace IRaCIS.Application.Services
if (isNeedReadClinicalData && !taskInfo.IsReadClinicalData)
{
throw new BusinessValidationFailedException($"临床数据未阅读！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_ClinicalRead"]);
}
@ -1443,7 +1443,7 @@ namespace IRaCIS.Application.Services
if (trialReadingCriterionId == null && inDto.VisitTaskId == null)
{
throw new BusinessValidationFailedException("当没有任务Id的时候，标准Id必传");
throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]);
}
if (inDto.VisitTaskId != null)
@ -1484,7 +1484,7 @@ namespace IRaCIS.Application.Services
if (currentSubject == null)
{
throw new BusinessValidationFailedException("当前受试者此次阅片任务已全部完成！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]);
}
task = currentSubject.UnReadTaskList.Select(x => new GetReadingTaskDto()
@ -1519,7 +1519,7 @@ namespace IRaCIS.Application.Services
}).FirstOrDefaultAsync();
if (task == null)
{
throw new BusinessValidationFailedException("当前受试者此次阅片任务已全部完成！");
throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]);
}
}
@ -1609,7 +1609,7 @@ namespace IRaCIS.Application.Services
int timespanMin = (DateTime.Now - cacheDate).Minutes;
if (timespanMin > 120 && timespanMin < 140)
{
throw new BusinessValidationFailedException("您已连续阅片2个小时，请休息20分钟后，再继续阅片。");
throw new BusinessValidationFailedException(_localizer["ReadingImage_NeedRest"]);
}
else if (timespanMin > 140)
{

6
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -274,7 +274,7 @@ namespace IRaCIS.Application.Services
{
Answer = item.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(),
QuestionType = JudgeReadingQuestionType.VisitRemark,
QuestionName = "全局阅片备注",
QuestionName = "",
});
judgeReadingInfo.VisitTaskInfoList.Add(judgeReadingQuestion);
@ -309,7 +309,7 @@ namespace IRaCIS.Application.Services
{
Answer = twoItem.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(),
QuestionType = JudgeReadingQuestionType.VisitRemark,
QuestionName = "全局阅片备注",
QuestionName = "",
});
judgeReadingInfo.VisitTaskInfoList.Add(rTwoJudge);
@ -375,7 +375,7 @@ namespace IRaCIS.Application.Services
{
if (taskInfo.SouceReadModuleId == null)
{
throw new BusinessValidationFailedException($"当前裁判的全局任务的SouceId为null");
throw new BusinessValidationFailedException(_localizer["ReadingJudge_SouceIdNull"]);
}
var visitId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
View File

@ -34,7 +34,7 @@ namespace IRaCIS.Application.Services
if (taskInfo.ReadingCategory != ReadingCategory.Oncology)
{
throw new BusinessValidationFailedException("当前任务不是肿瘤学任务");
throw new BusinessValidationFailedException(_localizer["ReadingOncology_TaskError"]);
}
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).FirstOrDefaultAsync();
@ -75,7 +75,7 @@ namespace IRaCIS.Application.Services
var judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == globalTaskInfo.JudgeVisitTaskId).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
if (judgeResultTaskId == null)
{
throw new BusinessValidationFailedException("异常，裁判结果为null");
throw new BusinessValidationFailedException(_localizer["ReadingOncology_Abnormal"]);
}
visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstOrDefaultAsync();
}

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

@ -395,7 +395,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
catch (Exception)
{
throw new BusinessValidationFailedException($"PCWG3标准配置异常！");
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_Abnormal"]);
}
await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask()
@ -951,18 +951,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (measureDataList.Count() > 0)
{
errorMassage += $" 病灶{ string.Join(',', measureDataList)}不存在标记,";
errorMassage += _localizer["ReadingCalculate_NoMarker", string.Join(',', measureDataList)];
}
if (tableAnswerList.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}状态为空,";
errorMassage += _localizer["ReadingCalculate_StatusIsEmpty", string.Join(',', stateIsNullList)] ;
}
if (allExists.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}未做标记，且状态为空,";
errorMassage += _localizer["ReadingCalculate_NoMarkerEmpty", string.Join(',', stateIsNullList)];
}

6
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -553,18 +553,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (measureDataList.Count() > 0)
{
errorMassage += $" 病灶{ string.Join(',', measureDataList)}不存在标记,";
errorMassage += _localizer["ReadingCalculate_NoMarker", string.Join(',', measureDataList)];
}
if (tableAnswerList.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}状态为空,";
errorMassage += _localizer["ReadingCalculate_StatusIsEmpty", string.Join(',', stateIsNullList)];
}
if (allExists.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}未做标记，且状态为空,";
errorMassage += _localizer["ReadingCalculate_NoMarkerEmpty", string.Join(',', stateIsNullList)];
}

2
IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs
View File

@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (criterionType == null)
{
throw new BusinessValidationFailedException($"当前标准计算未开发好");
throw new BusinessValidationFailedException(_localizer["ReadingCalculate_NoDeveloped"]);
}
try

11
IRaCIS.Core.Application/TestService.cs
View File

@ -1,6 +1,7 @@
using BeetleX.BNR;
using IRaCIS.Core.Application.Service;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
@ -123,7 +124,7 @@ namespace IRaCIS.Application.Services
}
[AllowAnonymous]
public async Task<object> GetEnvironmentName( [FromServices] IWebHostEnvironment env)
public async Task<string> GetEnvironmentName( [FromServices] IWebHostEnvironment env)
{
var a = 102.ToString().Substring(102.ToString().Length - 1);
@ -136,7 +137,7 @@ namespace IRaCIS.Application.Services
//await _repository.BatchUpdateAsync<DicomInstance>(u => !u.Path.Contains(".dcm"), t => new DicomInstance() { Path = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{t.TrialId}/{t.SiteId}/{t.SubjectId}/{t.SubjectVisitId}/{StaticData.Folder.DicomFolder}/{t.StudyId}/{t.Id}" });
return new { env.EnvironmentName , EMailConfig= _systemEmailConfig.CurrentValue,BasicConfig= _basicConfig.CurrentValue} ;
//return new { env.EnvironmentName , EMailConfig= _systemEmailConfig.CurrentValue,BasicConfig= _basicConfig.CurrentValue} ;
// Load a document.
@ -200,8 +201,10 @@ namespace IRaCIS.Application.Services
//var d = _dicRepository.UpdateFromDTOAsync(new AddOrEditBasicDic() { Id = Guid.Parse("60d86683-c33b-4349-b672-08da1e91b622"), ParentId = null, ChildGroup = null, Code = null }, true, true).Result;
//var a = 123;
//var b = _localizer["test{0}", "测试"];
//return _localizer["test{0}", "测试"];
throw new BusinessValidationFailedException(_localizer["TrialIsDoubleCheck{0}", "测试"]);
var b = _localizer["test{0}", "测试"];
return _localizer["test{0}", "测试"];
//var list = _repository.Where<SubjectVisit>(t => t.Id == Guid.NewGuid()).SelectMany(t => t.VisitTaskList).ToList();

BIN
后端提示语.xlsx Normal file
View File

Binary file not shown.