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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2023-04-28 15:01:42 +08:00
parent df4493e5af 38629114b6
commit 0fd1b52036
23 changed files with 403 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -2385,6 +2385,11 @@
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataLevel">
<summary>
临床级别
@ -2435,6 +2440,11 @@
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataLevel">
<summary>
临床级别
@ -2525,11 +2535,21 @@
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto.ClinicalDataSetName">
<summary>
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto.ClinicalDataLevel">
<summary>
临床级别
@ -2550,6 +2570,11 @@
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto.ClinicalDataLevel">
<summary>
临床级别
@ -2940,6 +2965,11 @@
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.ClinicalUploadType">
<summary>
上传方式
@ -3065,6 +3095,11 @@
项目配置临床类型Name
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataTrialSetId">
<summary>
下拉ID
@ -3180,6 +3215,11 @@
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectOutDto.ClinicalDataSetEnName">
<summary>
英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectOutDto.ClinicalDataLevel">
<summary>
临床级别
@ -4520,6 +4560,11 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingMedicineQuestion.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingMedicineQuestion.TypeValue">
<summary>
类型值
@ -4585,6 +4630,11 @@
肿瘤学原因
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.JudgeQuestionAnswerInfo.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.JudgeQuestionAnswerInfo.ShowOrder">
<summary>
排序
@ -7756,11 +7806,21 @@
<member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery">
<summary>ReadingMedicineSystemQuestionQuery 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.ReadingCategory">
<summary>
任务类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.TypeValue">
<summary>
类型值
@ -7809,6 +7869,11 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.IsRequired">
<summary>
是否是必须
@ -7859,6 +7924,11 @@
问题名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.TypeValue">
<summary>
类型值
@ -7902,6 +7972,11 @@
项目Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.ReadingCategory">
<summary>
任务类型
@ -7910,6 +7985,11 @@
<member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit">
<summary> ReadingMedicineTrialQuestionAddOrEdit 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.ReadingCategory">
<summary>
任务类型
@ -8283,36 +8363,76 @@
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionView.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView">
<summary> QCQuestionConfigureView 列表视图模型 </summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.QCQuestionQuery">
<summary>QCQuestionQuery 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.QuestionName">
<summary> QuestionName</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.Type">
<summary> TypeValue</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit">
<summary> QCQuestionAddOrEdit 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView">
<summary> TrialQCQuestionConfigureView 列表视图模型 </summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionSelect.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery">
<summary>TrialQCQuestionQuery 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.QuestionName">
<summary> QuestionName</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.Type">
<summary> TypeValue</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionAddOrEdit">
<summary> TrialQCQuestionAddOrEdit 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureBatchAdd.QuestionEnName">
<summary>
问题英文名称
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyService">
<summary>
NoneDicomStudyService

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

@ -3,6 +3,11 @@
"RequiredAttribute": "{0} is required",
//-------------------------------------------------------------------------------------Reading-----------------------------------------------------------------
//ClinicalDataSetService
"ClinicalDataSet_DupTypeFail": "There are duplicate clinical data of the same type. The operation failed.",
//ReadingClinicalDataService
"ReadingClinicalData_DupTypeFail": "There are duplicate clinical data of the same type. The operation failed.",
"ReadingClinicalData_Unchecked": "The current clinical data status is not verified and signing is not allowed!",
//ReadingGlobalTaskService
"ReadingGlobal_NotGlobal": "System call error. The current read is not a global review read.",
//ReadingImageTaskService

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

@ -3,6 +3,11 @@
"RequiredAttribute": "{0} 字段是必须的",
// ------------------------------------------------------------Reading--------------------------------------------------------------------
//ClinicalDataSetService
"ClinicalDataSet_DupTypeFail": "存在同类型的临床数据,操作失败",
//ReadingClinicalDataService
"ReadingClinicalData_DupTypeFail": "存在同类型的临床数据,操作失败",
"ReadingClinicalData_Unchecked": "当前临床数据状态不是已核查状态，不允许签名！",
//ReadingGlobalTaskService
"ReadingGlobal_NotGlobal": "系统调用错误，当前任务不是全局阅片任务。",
//ReadingImageTaskService

30
IRaCIS.Core.Application/Service/QC/DTO/QCQuestionConfigureViewModel.cs
View File

@ -20,7 +20,12 @@ namespace IRaCIS.Core.Application.Contracts
{
public Guid Id { get; set; }
public string QuestionName { get; set; } = String.Empty;
public bool IsRequired { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
public string Type { get; set; } = String.Empty;
public string ParentTriggerValue { get; set; }
@ -43,7 +48,12 @@ namespace IRaCIS.Core.Application.Contracts
{
public Guid Id { get; set; }
public string QuestionName { get; set; } = String.Empty;
public bool IsRequired { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
public string Type { get; set; } = String.Empty;
public string ParentTriggerValue { get; set; }
@ -67,8 +77,13 @@ namespace IRaCIS.Core.Application.Contracts
///<summary> QuestionName</summary>
public string QuestionName { get; set; } = String.Empty;
///<summary> TypeValue</summary>
public string Type { get; set; } = String.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
///<summary> TypeValue</summary>
public string Type { get; set; } = String.Empty;
public bool? IsEnable { get; set; }
@ -84,7 +99,12 @@ namespace IRaCIS.Core.Application.Contracts
{
public Guid? Id { get; set; }
public string QuestionName { get; set; } = String.Empty;
public bool IsRequired { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
public string Type { get; set; } = String.Empty;

30
IRaCIS.Core.Application/Service/QC/DTO/TrialQCQuestionConfigureViewModel.cs
View File

@ -13,7 +13,12 @@ namespace IRaCIS.Core.Application.Contracts
public Guid Id { get; set; }
public Guid TrialId { get; set; }
public string QuestionName { get; set; } = string.Empty;
public bool IsRequired { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
public string Type { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
@ -54,7 +59,12 @@ namespace IRaCIS.Core.Application.Contracts
public Guid Id { get; set; }
public string QuestionName { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public int ShowOrder { get; set; }
public string TypeValue { get; set; }
@ -68,8 +78,13 @@ namespace IRaCIS.Core.Application.Contracts
///<summary> QuestionName</summary>
public string QuestionName { get; set; } = string.Empty;
///<summary> TypeValue</summary>
public string Type { get; set; }=String.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
///<summary> TypeValue</summary>
public string Type { get; set; }=String.Empty;
public bool? IsEnable { get; set; }
@ -90,7 +105,12 @@ namespace IRaCIS.Core.Application.Contracts
public Guid? Id { get; set; }
public string QuestionName { get; set; } = string.Empty;
public bool IsRequired { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }

20
IRaCIS.Core.Application/Service/QC/QCQuestionService.cs
View File

@ -4,6 +4,8 @@
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Infra.EFCore.Common;
using IRaCIS.Core.Infrastructure;
using Microsoft.AspNetCore.Mvc;
@ -46,7 +48,8 @@ namespace IRaCIS.Core.Application.Contracts
ShowOrder = x.ShowOrder,
Id = x.Id,
ParentId = x.ParentId,
QuestionName = x.QuestionName,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
TypeValue = x.TypeValue,
}).ToListAsync();
@ -93,7 +96,7 @@ namespace IRaCIS.Core.Application.Contracts
var QCQuestionQueryable = _qcQuestionRepository
.WhereIf(queryQCQuestionConfigure.IsEnable != null,x=>x.IsEnable== queryQCQuestionConfigure.IsEnable)
.WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryQCQuestionConfigure.QuestionName))
.WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryQCQuestionConfigure.QuestionName) || t.QuestionEnName.Contains(queryQCQuestionConfigure.QuestionName))
.WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.Type), t => t.Type.Contains(queryQCQuestionConfigure.Type))
.WhereIf(queryQCQuestionConfigure.IsDefeaultViewParent==true,t=>t.ParentId==null)
.OrderBy(t=>t.ShowOrder)
@ -145,11 +148,20 @@ namespace IRaCIS.Core.Application.Contracts
var question = new List<QCQuestionView>();
if (inDto.TrialId!= null)
{
question = await _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId&&x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>(_mapper.ConfigurationProvider).ToListAsync();
question = await _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId&&x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>
(_mapper.ConfigurationProvider, new
{
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
}
else
{
question=await _qcQuestionRepository.Where(x=>x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>(_mapper.ConfigurationProvider).ToListAsync();
question=await _qcQuestionRepository.Where(x=>x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>(_mapper.ConfigurationProvider, new
{
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
}

8
IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs
View File

@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Contracts
var trialQCQuestionQueryable = _trialQcQuestionRepository.Where(t => t.TrialId == queryTrialQCQuestionConfigure.TrialId)
.WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryTrialQCQuestionConfigure.QuestionName))
.WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryTrialQCQuestionConfigure.QuestionName)|| t.QuestionEnName.Contains(queryTrialQCQuestionConfigure.QuestionName))
.WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.Type), t => t.Type.Contains(queryTrialQCQuestionConfigure.Type))
.WhereIf(queryTrialQCQuestionConfigure.IsEnable != null, t => t.IsEnable == queryTrialQCQuestionConfigure.IsEnable)
.WhereIf(queryTrialQCQuestionConfigure.IsRequired != null, t => t.IsRequired == queryTrialQCQuestionConfigure.IsRequired)
@ -81,7 +81,11 @@ namespace IRaCIS.Core.Application.Contracts
var initList = await _trialQcQuestionRepository.Where(t => t.TrialId == trialQCQuestionFilterSelect.TrialId)
.WhereIf(trialQCQuestionFilterSelect.TypeArray.Count() > 0, t => trialQCQuestionFilterSelect.TypeArray.Contains(t.Type))
.WhereIf(trialQCQuestionFilterSelect.Id != null, t => t.Id != trialQCQuestionFilterSelect.Id && t.ParentId != trialQCQuestionFilterSelect.Id)
.OrderBy(t => t.ShowOrder).ProjectTo<TrialQCQuestionSelect>(_mapper.ConfigurationProvider).ToListAsync();
.OrderBy(t => t.ShowOrder).ProjectTo<TrialQCQuestionSelect>(_mapper.ConfigurationProvider, new
{
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
//父亲的序号肯定要比自己小
if (trialQCQuestionFilterSelect.Id != null)

12
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -252,7 +252,8 @@ namespace IRaCIS.Core.Application.Service
string token = string.Empty;
string token = string.Empty;
//一致性核查
CreateMap<CheckDBModel, CheckViewModel>();
@ -302,10 +303,13 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialQCQuestionConfigureBatchAdd, TrialQCQuestion>();
CreateMap<TrialQCQuestion, TrialQCQuestionSelect>();
CreateMap<TrialQCQuestion, TrialQCQuestionSelect>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
CreateMap<TrialQCQuestion, QCQuestionView>();
CreateMap<QCQuestion, QCQuestionView>();
CreateMap<TrialQCQuestion, QCQuestionView>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
CreateMap<QCQuestion, QCQuestionView>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
CreateMap<QCQuestion, QCQuestionConfigureView>()

11
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
View File

@ -53,11 +53,12 @@ namespace IRaCIS.Application.Services
var existsQuery = _clinicalDataSystemSetRepository
.WhereIf(indto.Id != null, x => x.Id != indto.Id)
.Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName);
.Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName);
if (await existsQuery.AnyAsync())
{
return ResponseOutput.NotOk("存在同类型的临床数据,操作失败");
//---存在同类型的临床数据,操作失败
return ResponseOutput.NotOk(_localizer["ClinicalDataSet_DupTypeFail"]);
}
indto.CriterionEnumListStr= $"|{String.Join('|', indto.CriterionEnumList)}|";
@ -124,11 +125,12 @@ namespace IRaCIS.Application.Services
{
var existsQuery = _clinicalDataTrialSetRepository
.WhereIf(indto.Id != null, x => x.Id != indto.Id)
.Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName && x.TrialId == indto.TrialId);
.Where(x => (x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName) && x.TrialId == indto.TrialId);
if (await existsQuery.AnyAsync())
{
return ResponseOutput.NotOk("存在同类型的临床数据,操作失败");
//---存在同类型的临床数据,操作失败
return ResponseOutput.NotOk(_localizer["ClinicalDataSet_DupTypeFail"]);
}
//indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|";
@ -272,6 +274,7 @@ namespace IRaCIS.Application.Services
ClinicalDataSetName = x.ClinicalDataSetName,
ClinicalDataLevel = x.ClinicalDataLevel,
ClinicalUploadType = x.ClinicalUploadType,
ClinicalDataSetEnName=x.ClinicalDataSetEnName,
UploadRole = x.UploadRole,
FileName = x.FileName,
Path = x.Path,

18
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -83,7 +83,8 @@ namespace IRaCIS.Application.Services
if (await existsQuery.AnyAsync())
{
return ResponseOutput.NotOk("存在同类型的临床数据");
//---存在同类型的临床数据,操作失败
return ResponseOutput.NotOk(_localizer["ReadingClinicalData_DupTypeFail"]);
}
var clinicalDataTrialSet = (await _clinicalDataTrialSetRepository.Where(x => x.Id == indto.ClinicalDataTrialSetId).FirstOrDefaultAsync()).IfNullThrowException();
@ -191,8 +192,9 @@ namespace IRaCIS.Application.Services
.Select(x => new GetCRCClinicalDataOutDto()
{
Id = x.Id,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetName, _userInfo.IsEn_Us) ,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
FileName = x.ClinicalDataTrialSet.FileName,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
@ -280,7 +282,8 @@ namespace IRaCIS.Application.Services
if (data.ReadingClinicalDataState != ReadingClinicalDataStatus.HaveChecked)
{
throw new BusinessValidationFailedException("当前临床数据状态不是已核查状态，不允许签名！");
//---当前临床数据状态不是已核查状态，不允许签名！
throw new BusinessValidationFailedException(_localizer["ReadingClinicalData_Unchecked"]);
}
data.IsSign = true;
data.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned;
@ -482,7 +485,8 @@ namespace IRaCIS.Application.Services
.Select(x => new GetTrialClinicalDataSelectOutDto()
{
ClinicalDataLevel = x.ClinicalDataLevel,
ClinicalDataSetName = x.ClinicalDataSetName,
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataSetEnName=x.ClinicalDataSetEnName,
ClinicalUploadType = x.ClinicalUploadType,
FileName = x.FileName,
Path = x.Path,
@ -625,7 +629,8 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId,
ReadingId = x.ReadingId,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
@ -694,7 +699,8 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId,
ReadingId = x.ReadingId,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataSetEnName =x.ClinicalDataTrialSet.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,

59
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
View File

@ -19,10 +19,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
@ -83,10 +88,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 上传角色
@ -216,7 +226,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; } = string.Empty;
}
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
}
public class GetTrialClinicalDataSystemIndto
{
/// <summary>
@ -224,10 +239,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; } = String.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalDataLevel { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalDataLevel { get; set; }
/// <summary>
@ -259,10 +279,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; } = String.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalDataLevel { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalDataLevel { get; set; }
/// <summary>

15
IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
View File

@ -76,6 +76,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 上传方式
@ -311,6 +316,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 下拉ID
/// </summary>
@ -472,6 +482,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>

20
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -540,10 +540,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
/// <summary>
/// 是否启用
@ -658,7 +663,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string QuestionName { get; set; }
public string Answer { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public string Answer { get; set; }
/// <summary>
/// 排序

61
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
View File

@ -22,7 +22,13 @@ namespace IRaCIS.Core.Application.ViewModel
public string Type { get; set; } = string.Empty;
public string ParentTriggerValue { get; set; } = string.Empty;
public string QuestionName { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
public CriterionType? CurrentCriterionType { get; set; }
@ -50,10 +56,15 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; }
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
/// <summary>
/// 任务类型
@ -163,10 +174,15 @@ namespace IRaCIS.Core.Application.ViewModel
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
/// <summary>
/// 排序
@ -248,12 +264,15 @@ namespace IRaCIS.Core.Application.ViewModel
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
@ -309,7 +328,12 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 任务类型
@ -329,7 +353,12 @@ namespace IRaCIS.Core.Application.ViewModel
public string Type { get; set; }
public string? ParentTriggerValue { get; set; } = string.Empty;
public string QuestionName { get; set; }
public string TypeValue { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public string TypeValue { get; set; }
public Guid TrialId { get; set; }
public bool IsEnable { get; set; }

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

@ -357,10 +357,11 @@ namespace IRaCIS.Core.Application.Service
{
Id = data.Id,
Type = data.Type,
ParentTriggerValue = data.ParentTriggerValue,
ParentTriggerValue = data.ParentTriggerValue ,
QuestionEnName=data.QuestionEnName,
IsEnable = data.IsEnable,
IsConfirm = data.IsConfirm,
QuestionName = data.QuestionName,
QuestionName = data.QuestionName.LanguageName(data.QuestionEnName, _userInfo.IsEn_Us),
IsRequired = data.IsRequired,
ShowOrder = data.ShowOrder,
ParentId = data.ParentId,

21
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
View File

@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application.Service
var query = _readingMedicineSystemQuestionRepository.AsQueryable()
.WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
.WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName) || x.QuestionEnName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
.WhereIf(inDto.CurrentCriterionType!=null,x=>x.CriterionTypeEnum==null||x.CriterionTypeEnum==inDto.CurrentCriterionType)
@ -85,7 +85,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
{
Id = x.Id,
QuestionName = x.QuestionName,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
QuestionEnName =x.QuestionEnName,
TypeValue = x.TypeValue,
ReadingCategory = x.ReadingCategory,
}).ToListAsync();
@ -152,7 +153,7 @@ namespace IRaCIS.Core.Application.Service
.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
.WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
.WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)|| x.QuestionEnName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
.ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
@ -190,7 +191,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
{
Id = x.Id,
QuestionName = x.QuestionName,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
QuestionEnName=x.QuestionEnName,
TypeValue = x.TypeValue,
ReadingCategory = x.ReadingCategory,
}).ToListAsync();
@ -209,7 +211,13 @@ namespace IRaCIS.Core.Application.Service
{
var trialQuestionList = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
.ProjectTo<GetMedicineQuestionPreviewOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
.ProjectTo<GetMedicineQuestionPreviewOutDto>(_mapper.ConfigurationProvider, new
{
isEn_Us = _userInfo.IsEn_Us
})
.OrderBy(x => x.ShowOrder).ToListAsync();
List<GetMedicineQuestionPreviewOutDto> readingQuestionList = trialQuestionList.Where(x => x.ParentId == null).ToList();
readingQuestionList.ForEach(x =>
@ -458,8 +466,9 @@ namespace IRaCIS.Core.Application.Service
Id = NewId.NextGuid(),
ShowOrder = x.ShowOrder,
IsEnable = x.IsEnable,
QuestionEnName=x.QuestionEnName,
IsRequired = x.IsRequired,
QuestionName = x.QuestionName,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
TrialReadingCriterionId=inDto.TrialReadingCriterionId,
Type = x.Type,
ParentId=x.ParentId,

3
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -237,7 +237,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingMedicineTrialQuestion, ReadingMedicineTrialQuestionView>()
.ForMember(x=>x.ParentShowOrder,y=>y.MapFrom(n=>n.ParentQuestion.ShowOrder));
CreateMap<ReadingMedicineTrialQuestion, GetMedicineQuestionPreviewOutDto>();
CreateMap<ReadingMedicineTrialQuestion, GetMedicineQuestionPreviewOutDto>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
CreateMap<TaskMedicalReview, MedicalReviewInfo>()

5
IRaCIS.Core.Domain/QC/QCQuestion.cs
View File

@ -19,6 +19,11 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// IsRequired
/// </summary>

5
IRaCIS.Core.Domain/QC/TrialQCQuestion.cs
View File

@ -29,6 +29,11 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// IsRequired
/// </summary>

5
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
View File

@ -26,6 +26,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>

13
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
View File

@ -26,10 +26,15 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 英文名称
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>

5
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
View File

@ -34,6 +34,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 是否是必须
/// </summary>

9
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs
View File

@ -37,8 +37,13 @@ namespace IRaCIS.Core.Domain.Models
public string QuestionName { get; set; }
/// <summary>
/// 修改人
/// </summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 修改人
/// </summary>
public Guid UpdateUserId { get; set; }
/// <summary>