修改
This commit is contained in:
+33
-17
@@ -1,4 +1,4 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using IRaCIS.Core.Application.ViewModel;
|
||||
using IRaCIS.Core.Infra.EFCore.Common;
|
||||
using MassTransit;
|
||||
@@ -107,7 +107,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
if (await existsQuery.AnyAsync())
|
||||
{
|
||||
return ResponseOutput.NotOk("当前问题序号存在重复");
|
||||
//---当前问题序号存在重复
|
||||
return ResponseOutput.NotOk(_localizer["ReadingMed_QNumDup"]);
|
||||
}
|
||||
|
||||
//inDto.CriterionEnumStr = $"|{String.Join('|', inDto.CriterionEnumList)}|";
|
||||
@@ -127,7 +128,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
{
|
||||
if (await _readingMedicineSystemQuestionRepository.AnyAsync(x => x.ParentId == id))
|
||||
{
|
||||
return ResponseOutput.NotOk("此问题存在子问题,请先删除子问题");
|
||||
//---此问题存在子问题,请先删除子问题
|
||||
return ResponseOutput.NotOk(_localizer["ReadingMed_HasSubQ"]);
|
||||
}
|
||||
var success = await _readingMedicineSystemQuestionRepository.DeleteFromQueryAsync(t => t.Id == id);
|
||||
var result = await _readingMedicineSystemQuestionRepository.SaveChangesAsync();
|
||||
@@ -234,7 +236,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
if (await existsQuery.AnyAsync())
|
||||
{
|
||||
return ResponseOutput.NotOk("当前问题序号存在重复");
|
||||
//---当前问题序号存在重复
|
||||
return ResponseOutput.NotOk(_localizer["ReadingMed_QNumDup"]);
|
||||
}
|
||||
var entity = await _readingMedicineTrialQuestionRepository.InsertOrUpdateAsync(inDto);
|
||||
await _readingMedicineTrialQuestionRepository.SaveChangesAsync();
|
||||
@@ -253,7 +256,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
{
|
||||
if (await _readingMedicineTrialQuestionRepository.AnyAsync(x => x.ParentId == inDto.Id))
|
||||
{
|
||||
return ResponseOutput.NotOk("此问题存在子问题,请先删除子问题");
|
||||
//---此问题存在子问题,请先删除子问题
|
||||
return ResponseOutput.NotOk(_localizer["ReadingMed_HasSubQ"]);
|
||||
}
|
||||
var success = await _readingMedicineTrialQuestionRepository.DeleteFromQueryAsync(t => t.Id == inDto.Id);
|
||||
var result = await _readingMedicineTrialQuestionRepository.SaveChangesAsync();
|
||||
@@ -289,18 +293,21 @@ namespace IRaCIS.Core.Application.Service
|
||||
}).ToListAsync();
|
||||
if (readingMedicineQuestionList.Count == 0)
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前未添加医学审核问题。请先添加医学审核问题,再进行确认。");
|
||||
//---当前未添加医学审核问题。请先添加医学审核问题,再进行确认。
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_NoMedQ"]);
|
||||
}
|
||||
|
||||
if (readingMedicineQuestionList.Count() != readingMedicineQuestionList.Select(t => t.ShowOrder).Distinct().Count())
|
||||
{
|
||||
throw new BusinessValidationFailedException("影像医学审核问题显示序号不能重复。");
|
||||
//---影像医学审核问题显示序号不能重复。
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_MedQNumDup"]);
|
||||
}
|
||||
|
||||
|
||||
if (readingMedicineQuestionList.Where(t => t.ParentShowOrder != null).Any(t => t.ParentShowOrder > t.ShowOrder))
|
||||
{
|
||||
throw new BusinessValidationFailedException("父问题的显示序号要比子问题的显示序号小,请确认。");
|
||||
//---父问题的显示序号要比子问题的显示序号小,请确认。
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_ParentNumSmall"]);
|
||||
}
|
||||
|
||||
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => new
|
||||
@@ -316,17 +323,20 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
if (criterionInfo.IsGlobalReading && !readingMedicineQuestionList.Any(x => x.ReadingCategory == ReadingCategory.Global))
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前标准启用了全局阅片,但未配置全局医学审核问题");
|
||||
//---当前标准启用了全局阅片,但未配置全局医学审核问题
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_GlobalQNotConfig"]);
|
||||
}
|
||||
|
||||
if (criterionInfo.IsArbitrationReading && !readingMedicineQuestionList.Any(x => x.ReadingCategory == ReadingCategory.Judge))
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前标准启用了仲裁阅片,但未配置仲裁医学审核问题");
|
||||
//---当前标准启用了仲裁阅片,但未配置仲裁医学审核问题
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_ArbitrateQNotConfig"]);
|
||||
}
|
||||
|
||||
if (criterionInfo.IsOncologyReading && !readingMedicineQuestionList.Any(x => x.ReadingCategory == ReadingCategory.Oncology))
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前标准启用了肿瘤学阅片,但未配置肿瘤学医学审核问题");
|
||||
//---当前标准启用了肿瘤学阅片,但未配置肿瘤学医学审核问题
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_TumorQNotConfig"]);
|
||||
}
|
||||
|
||||
return ResponseOutput.Ok();
|
||||
@@ -356,18 +366,21 @@ namespace IRaCIS.Core.Application.Service
|
||||
}).ToListAsync();
|
||||
if (readingMedicineQuestionList.Count == 0)
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前未添加医学审核问题。请先添加医学审核问题,再进行确认。");
|
||||
//---当前未添加医学审核问题。请先添加医学审核问题,再进行确认。
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_NoMedQ"]);
|
||||
}
|
||||
|
||||
if (readingMedicineQuestionList.Count() != readingMedicineQuestionList.Select(t => t.ShowOrder).Distinct().Count())
|
||||
{
|
||||
throw new BusinessValidationFailedException("影像医学审核问题显示序号不能重复。");
|
||||
//---影像医学审核问题显示序号不能重复。
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_MedQNumDup"]);
|
||||
}
|
||||
|
||||
|
||||
if (readingMedicineQuestionList.Where(t => t.ParentShowOrder != null).Any(t => t.ParentShowOrder > t.ShowOrder))
|
||||
{
|
||||
throw new BusinessValidationFailedException("父问题的显示序号要比子问题的显示序号小,请确认。");
|
||||
//---父问题的显示序号要比子问题的显示序号小,请确认。
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_ParentNumSmall"]);
|
||||
}
|
||||
|
||||
|
||||
@@ -375,17 +388,20 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
if (criterionInfo.IsGlobalReading && !readingMedicineQuestionList.Any(x => x.ReadingCategory == ReadingCategory.Global))
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前项目启用了全局阅片,但未配置全局医学审核问题");
|
||||
//---当前标准启用了全局阅片,但未配置全局医学审核问题
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_GlobalQNotConfig"]);
|
||||
}
|
||||
|
||||
if (criterionInfo.IsArbitrationReading && !readingMedicineQuestionList.Any(x => x.ReadingCategory == ReadingCategory.Judge))
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前项目启用了仲裁阅片,但未配置仲裁医学审核问题");
|
||||
//---当前标准启用了仲裁阅片,但未配置仲裁医学审核问题
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_ArbitrateQNotConfig"]);
|
||||
}
|
||||
|
||||
if (criterionInfo.IsOncologyReading && !readingMedicineQuestionList.Any(x => x.ReadingCategory == ReadingCategory.Oncology))
|
||||
{
|
||||
throw new BusinessValidationFailedException("当前项目启用了肿瘤学阅片,但未配置肿瘤学医学审核问题");
|
||||
//---当前标准启用了肿瘤学阅片,但未配置肿瘤学医学审核问题
|
||||
throw new BusinessValidationFailedException(_localizer["ReadingMed_TumorQNotConfig"]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user