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

修改

Uat_Study
he 2023-05-04 16:50:04 +08:00
parent f9c61cabcc
commit 9f27d4ff11
17 changed files with 142 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4595,6 +4595,11 @@
是否确认 是否确认
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingMedicineQuestion.LanguageType">
<summary>
语言类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TaskInfo.IsCurrentTask"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TaskInfo.IsCurrentTask">
<summary> <summary>
是否是当前任务 是否是当前任务
@ -7806,9 +7811,9 @@
<member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery"> <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery">
<summary>ReadingMedicineSystemQuestionQuery 列表查询参数模型</summary> <summary>ReadingMedicineSystemQuestionQuery 列表查询参数模型</summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.QuestionEnName"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.ReadingCategory"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.ReadingCategory">
@ -7816,9 +7821,9 @@
任务类型 任务类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.QuestionEnName"> <member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.TypeValue"> <member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.TypeValue">
@ -7869,9 +7874,9 @@
问题名称 问题名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.QuestionEnName"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.IsRequired"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.IsRequired">
@ -7924,9 +7929,9 @@
问题名称 问题名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.QuestionEnName"> <member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.TypeValue"> <member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.TypeValue">
@ -7972,9 +7977,9 @@
项目Id 项目Id
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.QuestionEnName"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.ReadingCategory"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.ReadingCategory">
@ -7985,9 +7990,9 @@
<member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit"> <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit">
<summary> ReadingMedicineTrialQuestionAddOrEdit 列表查询参数模型</summary> <summary> ReadingMedicineTrialQuestionAddOrEdit 列表查询参数模型</summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.QuestionEnName"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.ReadingCategory"> <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.ReadingCategory">
@ -8363,17 +8368,17 @@
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionView.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionView.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView"> <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView">
<summary> QCQuestionConfigureView 列表视图模型 </summary> <summary> QCQuestionConfigureView 列表视图模型 </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Contracts.QCQuestionQuery"> <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionQuery">
@ -8382,9 +8387,9 @@
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.QuestionName"> <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.QuestionName">
<summary> QuestionName</summary> <summary> QuestionName</summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.Type"> <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.Type">
@ -8393,22 +8398,22 @@
<member name="T:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit"> <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit">
<summary> QCQuestionAddOrEdit 列表查询参数模型</summary> <summary> QCQuestionAddOrEdit 列表查询参数模型</summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView"> <member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView">
<summary> TrialQCQuestionConfigureView 列表视图模型 </summary> <summary> TrialQCQuestionConfigureView 列表视图模型 </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionSelect.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionSelect.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery"> <member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery">
@ -8417,9 +8422,9 @@
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.QuestionName"> <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.QuestionName">
<summary> QuestionName</summary> <summary> QuestionName</summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.Type"> <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.Type">
@ -8428,9 +8433,9 @@
<member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionAddOrEdit"> <member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionAddOrEdit">
<summary> TrialQCQuestionAddOrEdit 列表查询参数模型</summary> <summary> TrialQCQuestionAddOrEdit 列表查询参数模型</summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureBatchAdd.QuestionEnName"> <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureBatchAdd.LanguageType">
<summary> <summary>
问题英文名称 语言类型
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyService"> <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyService">

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

@ -3,6 +3,7 @@
// 生成时间 2021-11-11 11:48:52 // 生成时间 2021-11-11 11:48:52
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//-------------------------------------------------------------------- //--------------------------------------------------------------------
using IRaCIS.Core.Domain.Share;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace IRaCIS.Core.Application.Contracts namespace IRaCIS.Core.Application.Contracts
@ -22,9 +23,9 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionName { get; set; } = String.Empty; public string QuestionName { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
public string Type { get; set; } = String.Empty; public string Type { get; set; } = String.Empty;
@ -50,9 +51,9 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionName { get; set; } = String.Empty; public string QuestionName { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
public string Type { get; set; } = String.Empty; public string Type { get; set; } = String.Empty;
@ -72,15 +73,15 @@ namespace IRaCIS.Core.Application.Contracts
} }
///<summary>QCQuestionQuery 列表查询参数模型</summary> ///<summary>QCQuestionQuery 列表查询参数模型</summary>
public class QCQuestionQuery public class QCQuestionQuery:PageInput
{ {
///<summary> QuestionName</summary> ///<summary> QuestionName</summary>
public string QuestionName { get; set; } = String.Empty; public string QuestionName { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType? LanguageType { get; set; }
///<summary> TypeValue</summary> ///<summary> TypeValue</summary>
public string Type { get; set; } = String.Empty; public string Type { get; set; } = String.Empty;
@ -101,9 +102,9 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionName { get; set; } = String.Empty; public string QuestionName { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
public string Type { get; set; } = String.Empty; public string Type { get; set; } = String.Empty;

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

@ -3,6 +3,7 @@
// 生成时间 2021-11-11 11:48:52 // 生成时间 2021-11-11 11:48:52
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//-------------------------------------------------------------------- //--------------------------------------------------------------------
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.Contracts namespace IRaCIS.Core.Application.Contracts
@ -15,9 +16,9 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;
@ -60,9 +61,9 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
@ -79,9 +80,9 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType? LanguageType { get; set; }
///<summary> TypeValue</summary> ///<summary> TypeValue</summary>
public string Type { get; set; }=String.Empty; public string Type { get; set; }=String.Empty;
@ -107,9 +108,9 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;

2
IRaCIS.Core.Application/Service/QC/Interface/IQCQuestionService.cs
View File

@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.Contracts
{ {
Task<IResponseOutput> AddOrUpdateQCQuestionConfigure(QCQuestionAddOrEdit addOrEditQCQuestionConfigure); Task<IResponseOutput> AddOrUpdateQCQuestionConfigure(QCQuestionAddOrEdit addOrEditQCQuestionConfigure);
Task<IResponseOutput> DeleteQCQuestionConfigure(Guid qCQuestionConfigureId); Task<IResponseOutput> DeleteQCQuestionConfigure(Guid qCQuestionConfigureId);
Task<List<QCQuestionConfigureView>> GetQCQuestionConfigureList(QCQuestionQuery queryQCQuestionConfigure); Task<PageOutput<QCQuestionConfigureView>> GetQCQuestionConfigureList(QCQuestionQuery queryQCQuestionConfigure);
} }

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

@ -48,8 +48,8 @@ namespace IRaCIS.Core.Application.Contracts
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
Id = x.Id, Id = x.Id,
ParentId = x.ParentId, ParentId = x.ParentId,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us), QuestionName = x.QuestionName,
LanguageType=x.LanguageType,
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
}).ToListAsync(); }).ToListAsync();
@ -91,18 +91,19 @@ namespace IRaCIS.Core.Application.Contracts
[HttpPost] [HttpPost]
public async Task<List<QCQuestionConfigureView>> GetQCQuestionConfigureList(QCQuestionQuery queryQCQuestionConfigure) public async Task<PageOutput<QCQuestionConfigureView>> GetQCQuestionConfigureList(QCQuestionQuery queryQCQuestionConfigure)
{ {
var QCQuestionQueryable = _qcQuestionRepository var QCQuestionQueryable = _qcQuestionRepository
.WhereIf(queryQCQuestionConfigure.IsEnable != null,x=>x.IsEnable== queryQCQuestionConfigure.IsEnable) .WhereIf(queryQCQuestionConfigure.IsEnable != null,x=>x.IsEnable== queryQCQuestionConfigure.IsEnable)
.WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryQCQuestionConfigure.QuestionName) || t.QuestionEnName.Contains(queryQCQuestionConfigure.QuestionName)) .WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryQCQuestionConfigure.QuestionName))
.WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.Type), t => t.Type.Contains(queryQCQuestionConfigure.Type)) .WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.Type), t => t.Type.Contains(queryQCQuestionConfigure.Type))
.WhereIf(queryQCQuestionConfigure.IsDefeaultViewParent==true,t=>t.ParentId==null) .WhereIf(queryQCQuestionConfigure.LanguageType!=null, t =>t.LanguageType== queryQCQuestionConfigure.LanguageType)
.WhereIf(queryQCQuestionConfigure.IsDefeaultViewParent==true,t=>t.ParentId==null)
.OrderBy(t=>t.ShowOrder) .OrderBy(t=>t.ShowOrder)
.ProjectTo<QCQuestionConfigureView>(_mapper.ConfigurationProvider); .ProjectTo<QCQuestionConfigureView>(_mapper.ConfigurationProvider);
return await QCQuestionQueryable.ToListAsync(); return await QCQuestionQueryable.ToPagedListAsync(queryQCQuestionConfigure.PageIndex, queryQCQuestionConfigure.PageSize, queryQCQuestionConfigure.SortField.IsNullOrEmpty()?nameof(queryQCQuestionConfigure.QuestionName): queryQCQuestionConfigure.SortField, queryQCQuestionConfigure.Asc);
} }
public async Task<IResponseOutput> AddOrUpdateQCQuestionConfigure(QCQuestionAddOrEdit addOrEditQCQuestionConfigure) public async Task<IResponseOutput> AddOrUpdateQCQuestionConfigure(QCQuestionAddOrEdit addOrEditQCQuestionConfigure)

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

@ -39,13 +39,14 @@ namespace IRaCIS.Core.Application.Contracts
var trialQCQuestionQueryable = _trialQcQuestionRepository.Where(t => t.TrialId == queryTrialQCQuestionConfigure.TrialId) var trialQCQuestionQueryable = _trialQcQuestionRepository.Where(t => t.TrialId == queryTrialQCQuestionConfigure.TrialId)
.WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryTrialQCQuestionConfigure.QuestionName)|| t.QuestionEnName.Contains(queryTrialQCQuestionConfigure.QuestionName)) .WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryTrialQCQuestionConfigure.QuestionName))
.WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.Type), t => t.Type.Contains(queryTrialQCQuestionConfigure.Type)) .WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.Type), t => t.Type.Contains(queryTrialQCQuestionConfigure.Type))
.WhereIf(queryTrialQCQuestionConfigure.IsEnable != null, t => t.IsEnable == queryTrialQCQuestionConfigure.IsEnable) .WhereIf(queryTrialQCQuestionConfigure.IsEnable != null, t => t.IsEnable == queryTrialQCQuestionConfigure.IsEnable)
.WhereIf(queryTrialQCQuestionConfigure.IsRequired != null, t => t.IsRequired == queryTrialQCQuestionConfigure.IsRequired) .WhereIf(queryTrialQCQuestionConfigure.IsRequired != null, t => t.IsRequired == queryTrialQCQuestionConfigure.IsRequired)
.WhereIf(queryTrialQCQuestionConfigure.LanguageType != null, t => t.LanguageType == queryTrialQCQuestionConfigure.LanguageType)
.ProjectTo<TrialQCQuestionConfigureView>(_mapper.ConfigurationProvider); .ProjectTo<TrialQCQuestionConfigureView>(_mapper.ConfigurationProvider);
var list = await trialQCQuestionQueryable.OrderBy(t => t.ShowOrder).ToListAsync(); var list = await trialQCQuestionQueryable.OrderBy(t => t.ShowOrder).ToListAsync();

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

@ -303,13 +303,10 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialQCQuestionConfigureBatchAdd, TrialQCQuestion>(); 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<TrialQCQuestion, QCQuestionView>();
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)); CreateMap<QCQuestion, QCQuestionView>();
CreateMap<QCQuestion, QCQuestionView>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
CreateMap<QCQuestion, QCQuestionConfigureView>() CreateMap<QCQuestion, QCQuestionConfigureView>()

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

@ -575,8 +575,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public bool? IsConfirm { get; set; } public bool? IsConfirm { get; set; }
/// <summary>
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public List<ReadingMedicineQuestion> Childrens { get; set; }
public List<ReadingMedicineQuestion> Childrens { get; set; }
} }
public class TaskInfo public class TaskInfo

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

@ -24,9 +24,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType? LanguageType { get; set; }
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
@ -57,9 +57,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } public string QuestionName { get; set; }
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> /// <summary>
/// 类型值 /// 类型值
@ -175,9 +175,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } public string QuestionName { get; set; }
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> /// <summary>
/// 是否是必须 /// 是否是必须
@ -265,9 +265,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } public string QuestionName { get; set; }
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> /// <summary>
/// 类型值 /// 类型值
@ -329,9 +329,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType? LanguageType { get; set; }
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
@ -355,9 +355,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string QuestionName { get; set; } public string QuestionName { get; set; }
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public string TypeValue { get; set; } public string TypeValue { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }

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

@ -355,19 +355,19 @@ namespace IRaCIS.Core.Application.Service
from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty() from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty()
select new ReadingMedicineQuestion() select new ReadingMedicineQuestion()
{ {
Id = data.Id, Id = data.Id,
Type = data.Type, Type = data.Type,
ParentTriggerValue = data.ParentTriggerValue , ParentTriggerValue = data.ParentTriggerValue,
QuestionEnName=data.QuestionEnName, LanguageType = data.LanguageType,
IsEnable = data.IsEnable, IsEnable = data.IsEnable,
IsConfirm = data.IsConfirm, IsConfirm = data.IsConfirm,
QuestionName = data.QuestionName.LanguageName(data.QuestionEnName, _userInfo.IsEn_Us), QuestionName = data.QuestionName,
IsRequired = data.IsRequired, IsRequired = data.IsRequired,
ShowOrder = data.ShowOrder, ShowOrder = data.ShowOrder,
ParentId = data.ParentId, ParentId = data.ParentId,
TypeValue = data.TypeValue, TypeValue = data.TypeValue,
Answer = leftquestionAnswer.Answer Answer = leftquestionAnswer.Answer
}; };
var questionList = await questionQuery.OrderBy(x=>x.ShowOrder).ToListAsync(); var questionList = await questionQuery.OrderBy(x=>x.ShowOrder).ToListAsync();

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

@ -52,13 +52,14 @@ namespace IRaCIS.Core.Application.Service
var query = _readingMedicineSystemQuestionRepository.AsQueryable() var query = _readingMedicineSystemQuestionRepository.AsQueryable()
.WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue)) .WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
.WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue)) .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName) || x.QuestionEnName.Contains(inDto.QuestionName)) .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName) )
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type)) .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory) .WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
.WhereIf(inDto.CurrentCriterionType!=null,x=>x.CriterionTypeEnum==null||x.CriterionTypeEnum==inDto.CurrentCriterionType) .WhereIf(inDto.CurrentCriterionType!=null,x=>x.CriterionTypeEnum==null||x.CriterionTypeEnum==inDto.CurrentCriterionType)
.WhereIf(inDto.CriterionTypeEnum != null, x => x.CriterionTypeEnum==inDto.CriterionTypeEnum) .WhereIf(inDto.CriterionTypeEnum != null, x => x.CriterionTypeEnum==inDto.CriterionTypeEnum)
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.CriterionTypeEnum== criterionEnum || x.IsGeneral==true) .WhereIf(inDto.TrialReadingCriterionId != null, x => x.CriterionTypeEnum== criterionEnum || x.IsGeneral==true)
.WhereIf(inDto.IsGeneral != null, x => x.IsGeneral == inDto.IsGeneral) .WhereIf(inDto.IsGeneral != null, x => x.IsGeneral == inDto.IsGeneral)
.WhereIf(inDto.LanguageType != null, x => x.LanguageType == inDto.LanguageType.Value)
.ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder); .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize,inDto.SortField,inDto.Asc); return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize,inDto.SortField,inDto.Asc);
@ -85,8 +86,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto() .Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
{ {
Id = x.Id, Id = x.Id,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us), QuestionName = x.QuestionName,
QuestionEnName =x.QuestionEnName, LanguageType =x.LanguageType,
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
}).ToListAsync(); }).ToListAsync();
@ -153,9 +154,10 @@ namespace IRaCIS.Core.Application.Service
.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId) .Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
.WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue)) .WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
.WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue)) .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)|| x.QuestionEnName.Contains(inDto.QuestionName)) .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type)) .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory) .WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
.WhereIf(inDto.LanguageType != null, x => x.LanguageType == inDto.LanguageType)
.ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder); .ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
@ -191,8 +193,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto() .Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
{ {
Id = x.Id, Id = x.Id,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us), QuestionName = x.QuestionName,
QuestionEnName=x.QuestionEnName, LanguageType=x.LanguageType,
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
}).ToListAsync(); }).ToListAsync();
@ -466,9 +468,9 @@ namespace IRaCIS.Core.Application.Service
Id = NewId.NextGuid(), Id = NewId.NextGuid(),
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
IsEnable = x.IsEnable, IsEnable = x.IsEnable,
QuestionEnName=x.QuestionEnName, LanguageType = x.LanguageType,
IsRequired = x.IsRequired, IsRequired = x.IsRequired,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us), QuestionName = x.QuestionName,
TrialReadingCriterionId=inDto.TrialReadingCriterionId, TrialReadingCriterionId=inDto.TrialReadingCriterionId,
Type = x.Type, Type = x.Type,
ParentId=x.ParentId, ParentId=x.ParentId,

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

@ -237,8 +237,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingMedicineTrialQuestion, ReadingMedicineTrialQuestionView>() CreateMap<ReadingMedicineTrialQuestion, ReadingMedicineTrialQuestionView>()
.ForMember(x=>x.ParentShowOrder,y=>y.MapFrom(n=>n.ParentQuestion.ShowOrder)); .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>() CreateMap<TaskMedicalReview, MedicalReviewInfo>()

26
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -16,10 +16,28 @@ namespace IRaCIS.Core.Domain.Share
public static readonly string Group = "group"; public static readonly string Group = "group";
} }
/// <summary>
/// 标准字典分类 /// <summary>
/// </summary> /// 语言类型
public enum CrterionDictionaryGroup /// </summary>
public enum LanguageType
{
/// <summary>
/// 中文
/// </summary>
Chinese = 0,
/// <summary>
/// 英文
/// </summary>
English = 1
}
/// <summary>
/// 标准字典分类
/// </summary>
public enum CrterionDictionaryGroup
{ {
/// <summary> /// <summary>

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

@ -2,6 +2,7 @@
// 此代码由T4模板自动生成 byzhouhang 20210918 // 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2021-11-11 11:19:10 // 生成时间 2021-11-11 11:19:10
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using IRaCIS.Core.Domain.Share;
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
@ -19,10 +20,11 @@ namespace IRaCIS.Core.Domain.Models
[Required] [Required]
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> /// <summary>
/// IsRequired /// IsRequired

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

@ -2,6 +2,7 @@
// 此代码由T4模板自动生成 byzhouhang 20210918 // 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2021-11-11 11:19:10 // 生成时间 2021-11-11 11:19:10
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using IRaCIS.Core.Domain.Share;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
@ -30,9 +31,9 @@ namespace IRaCIS.Core.Domain.Models
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> /// <summary>
/// IsRequired /// IsRequired

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

@ -35,9 +35,9 @@ namespace IRaCIS.Core.Domain.Models
public string QuestionName { get; set; } public string QuestionName { get; set; }
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> /// <summary>
/// 是否是必须 /// 是否是必须

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

@ -37,9 +37,9 @@ namespace IRaCIS.Core.Domain.Models
public string QuestionName { get; set; } public string QuestionName { get; set; }
/// <summary> /// <summary>
/// 问题英文名称 /// 语言类型
/// </summary> /// </summary>
public string QuestionEnName { get; set; } = string.Empty; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> /// <summary>
/// 修改人 /// 修改人