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-06-25 09:22:43 +08:00
parent c79f387af2 9171a62979
commit b4ade5e956
18 changed files with 472 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,10 @@
//-------------------------------------------------------------------------------------Reading-----------------------------------------------------------------
//ClinicalDataSetService
"ClinicalDataSet_Apply": "",
"ClinicalDataSet_DupTypeFail": "The same type of clinical data exists. The operation failed.",
//ClinicalQuestionService
"ClinicalQuestion_Repeat": "",
//ReadingClinicalDataService
"ReadingClinicalData_DupTypeFail": "The same type of clinical data exists. The operation failed.",
"ReadingClinicalData_Unchecked": "The current clinical data status is not verified and signing is not allowed!",

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

@ -39,7 +39,10 @@
// ------------------------------------------------------------Reading--------------------------------------------------------------------
//ClinicalDataSetService
"ClinicalDataSet_Apply": "当前临床数据需要配置一个检查日期才能应用",
"ClinicalDataSet_DupTypeFail": "存在同类型的临床数据,操作失败",
//ClinicalQuestionService
"ClinicalQuestion_Repeat": "存在相同的问题名称！",
//ReadingClinicalDataService
"ReadingClinicalData_DupTypeFail": "存在同类型的临床数据,操作失败",
"ReadingClinicalData_Unchecked": "当前临床数据状态不是已核查状态，不允许签名！",

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

@ -2,6 +2,9 @@
using IRaCIS.Core.Application.Service.Reading.Dto;
using MassTransit;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure;
namespace IRaCIS.Application.Services
{
@ -11,7 +14,7 @@ namespace IRaCIS.Application.Services
[ApiExplorerSettings(GroupName = "Reading")]
public class ClinicalDataSetService : BaseService
{
public IClinicalQuestionService _iClinicalQuestionService;
public IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
@ -19,22 +22,28 @@ namespace IRaCIS.Application.Services
private readonly IRepository<PreviousPDF> _previousPDFRepository;
private readonly IRepository<Dictionary> _dictionaryRepository;
private readonly IRepository<Trial> _trialRepository;
private readonly IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository;
private readonly IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository;
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
IClinicalQuestionService iClinicalQuestionService,
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
IRepository<PreviousPDF> previousPDFRepository,
IRepository<Dictionary> dictionaryRepository,
IRepository<Trial> trialRepository
IRepository<TrialClinicalQuestion> trialClinicalQuestionRepository,
IRepository<SystemClinicalQuestion> systemClinicalQuestionRepository,
IRepository<Trial> trialRepository
)
{
_iClinicalQuestionService = iClinicalQuestionService;
_subjectVisitRepository = subjectVisitRepository;
_trialClinicalQuestionRepository = trialClinicalQuestionRepository;
_systemClinicalQuestionRepository = systemClinicalQuestionRepository;
_clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
this._previousPDFRepository = previousPDFRepository;
@ -43,6 +52,58 @@ namespace IRaCIS.Application.Services
}
/// <summary>
/// 应用系统临床数据
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception>
[HttpPost]
public async Task<IResponseOutput> ApplySystemClinical(ApplySystemClinicalInDto inDto)
{
if (_systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.IsCheckDate).Count() != 1)
{
throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]);
}
await _clinicalDataSystemSetRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.SystemClinicalId, x => new ClinicalDataSystemSet()
{
IsApply = true
});
await _clinicalDataSystemSetRepository.SaveChangesAsync();
return ResponseOutput.Ok(true);
}
/// <summary>
/// 应用项目临床数据
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception>
[HttpPost]
public async Task<IResponseOutput> ApplyTrialClinical(ApplyTrialClinicalInDto inDto)
{
if (_trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && x.IsCheckDate).Count() != 1)
{
throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]);
}
await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialClinicalId, x => new ClinicalDataTrialSet()
{
IsApply = true
});
await _clinicalDataTrialSetRepository.SaveChangesAsync();
return ResponseOutput.Ok(true);
}
#region 系统
/// <summary>
@ -53,7 +114,10 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateClinicalDataSystemSet(ClinicalDataSystemSetAddOrEdit indto)
{
if (indto.ClinicalUploadType == ClinicalUploadType.Table || indto.ClinicalUploadType == ClinicalUploadType.PDF)
{
indto.IsApply = true;
}
var dictionary = await _dictionaryRepository.Where(x => x.Parent.Code == "ClinicalDataType" && x.Code == indto.ClinicalDataSetEnum.ToString()).FirstNotNullAsync();
indto.ClinicalDataSetName = dictionary.ValueCN;
indto.ClinicalDataSetEnName = dictionary.Value;
@ -129,6 +193,12 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateClinicalDataTrialSet(ClinicalDataTrialSetAddOrEdit indto)
{
if (indto.ClinicalUploadType == ClinicalUploadType.Table || indto.ClinicalUploadType == ClinicalUploadType.PDF)
{
indto.IsApply = true;
}
var existsQuery = _clinicalDataTrialSetRepository
.WhereIf(indto.Id != null, x => x.Id != indto.Id)
.Where(x => (x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName) && x.TrialId == indto.TrialId);
@ -260,7 +330,7 @@ namespace IRaCIS.Application.Services
//不存在的时候，就将系统数据同步到项目临床数据配置
if (!await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null))
{
var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().ToListAsync();
var systemClinicalDataList = await _clinicalDataSystemSetRepository.Where(x=>x.IsApply).AsQueryable().ToListAsync();
var systemIds = systemClinicalDataList.Select(x => x.Id).ToList();
var trialSystemClinicalDataSetIds = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
@ -285,6 +355,7 @@ namespace IRaCIS.Application.Services
FileName = x.FileName,
Path = x.Path,
TrialId = trialId,
IsApply = x.IsApply,
//项目不采用 标准枚举字符串的方式
//CriterionEnumListStr=x.CriterionEnumListStr
@ -299,6 +370,13 @@ namespace IRaCIS.Application.Services
var result = await _clinicalDataTrialSetRepository.SaveChangesAsync();
await _iClinicalQuestionService.SynchronizationQuestion(dataSets.Select(x => new SynchronizationQuestionDto()
{
SystemClinicalId = x.SystemClinicalDataSetId.Value,
TrialClinicalId = x.Id,
}).ToList());
}
#endregion

206
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
View File

@ -9,17 +9,19 @@ using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Infra.EFCore.Common;
using IRaCIS.Core.Domain.Share;
using MassTransit;
namespace IRaCIS.Core.Application.Service
{
/// <summary>
/// 临床数据问题
/// </summary>
[ ApiExplorerSettings(GroupName = "Reading")]
public class ClinicalQuestionService: BaseService
[ApiExplorerSettings(GroupName = "Reading")]
public class ClinicalQuestionService : BaseService, IClinicalQuestionService
{
private readonly IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository;
private readonly IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository;
private readonly IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository;
@ -33,11 +35,11 @@ namespace IRaCIS.Core.Application.Service
IRepository<TrialClinicalTableQuestion> trialClinicalTableQuestionRepository,
IRepository<SystemClinicalQuestion> systemClinicalQuestionRepository
)
{
{
_systemClinicalTableQuestionRepository = systemClinicalTableQuestionRepository;
_trialClinicalQuestionRepository = trialClinicalQuestionRepository;
_trialClinicalTableQuestionRepository = trialClinicalTableQuestionRepository;
_systemClinicalQuestionRepository = systemClinicalQuestionRepository;
_systemClinicalQuestionRepository = systemClinicalQuestionRepository;
}
@ -52,8 +54,8 @@ namespace IRaCIS.Core.Application.Service
public async Task<PageOutput<TrialClinicalQuestionDto>> GetTrialClinicalQuestionList(TrialClinicalQuestionQuery inQuery)
{
var trialClinicalQuestionQueryable =_trialClinicalQuestionRepository
.WhereIf(!inQuery.QuestionName.IsNullOrEmpty(),x=>x.QuestionName.Contains(inQuery.QuestionName)||x.QuestionEnName.Contains(inQuery.QuestionName))
var trialClinicalQuestionQueryable = _trialClinicalQuestionRepository
.WhereIf(!inQuery.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inQuery.QuestionName) || x.QuestionEnName.Contains(inQuery.QuestionName))
.ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider);
var pageList = await trialClinicalQuestionQueryable
.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TrialClinicalQuestion.ShowOrder) : inQuery.SortField,
@ -70,6 +72,11 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateTrialClinicalQuestion(TrialClinicalQuestionDto inDto)
{
if (await _trialClinicalQuestionRepository.AnyAsync(x =>x.TrialClinicalId==inDto.TrialClinicalId && x.Id != inDto.Id && x.QuestionName == inDto.QuestionName))
{
return ResponseOutput.NotOk(_localizer["ClinicalQuestion_Repeat"]);
}
var entity = await _trialClinicalQuestionRepository.InsertOrUpdateAsync(inDto, true);
return ResponseOutput.Ok(entity.Id.ToString());
@ -95,10 +102,26 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<List<TrialClinicalQuestionDto>> GetTrialClinicalGroupQuestionList(GetTrialGroupDto inDto)
{
return await this._trialClinicalQuestionRepository.Where(x=>x.TrialClinicalId== inDto.TrialClinicalId)
return await this._trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId&&x.ClinicalQuestionType== "group")
.ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
}
/// <summary>
/// 获取项目标准其他问题
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<TrialClinicalQuestionDto>> GetTrialClinicalOtherQuestionList(GetTrialGroupDto inDto)
{
var types = new List<string>()
{
"select","radio"
};
return await this._trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && types.Contains( x.ClinicalQuestionType))
.ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
}
#endregion
@ -131,6 +154,11 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateSystemClinicalQuestion(SystemClinicalQuestionDto inDto)
{
if (await _systemClinicalQuestionRepository.AnyAsync(x => x.SystemClinicalId == inDto.SystemClinicalId && x.Id != inDto.Id && x.QuestionName == inDto.QuestionName))
{
return ResponseOutput.NotOk(_localizer["ClinicalQuestion_Repeat"]);
}
var entity = await _systemClinicalQuestionRepository.InsertOrUpdateAsync(inDto, true);
return ResponseOutput.Ok(entity.Id.ToString());
@ -158,9 +186,28 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<List<SystemClinicalQuestionDto>> GetSystemClinicalGroupQuestionList(GetSystemGroupDto inDto)
{
return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.ClinicalQuestionType =="group")
.ProjectTo<SystemClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
}
/// <summary>
/// 获取系统其他问题
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<SystemClinicalQuestionDto>> GetSystemClinicalOtherQuestionList(GetSystemGroupDto inDto)
{
var types = new List<string>()
{
"select","radio"
};
return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && types.Contains(x.ClinicalQuestionType))
.ProjectTo<SystemClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
}
#endregion
#region 系统表格问题
@ -175,7 +222,7 @@ namespace IRaCIS.Core.Application.Service
{
var systemClinicalTableQuestionQueryable = this._systemClinicalTableQuestionRepository
.Where(x=>x.QuestionId==inQuery.QuestionId)
.Where(x => x.QuestionId == inQuery.QuestionId)
.ProjectTo<SystemClinicalTableQuestionDto>(_mapper.ConfigurationProvider);
var pageList = await systemClinicalTableQuestionQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(SystemClinicalTableQuestion.ShowOrder) : inQuery.SortField,
@ -193,7 +240,11 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateSystemClinicalTableQuestion(SystemClinicalTableQuestionDto inDto)
{
if (await _systemClinicalTableQuestionRepository.AnyAsync(x => x.QuestionId == inDto.QuestionId && x.Id != inDto.Id && x.QuestionName == inDto.QuestionName))
{
return ResponseOutput.NotOk(_localizer["ClinicalQuestion_Repeat"]);
}
var entity = await _systemClinicalTableQuestionRepository.InsertOrUpdateAsync(inDto, true);
return ResponseOutput.Ok(entity.Id.ToString());
@ -205,7 +256,7 @@ namespace IRaCIS.Core.Application.Service
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id:guid}")]
[HttpPost("{id:guid}")]
public async Task<IResponseOutput> DeleteSystemClinicalTableQuestion(Guid id)
{
var success = await _systemClinicalTableQuestionRepository.DeleteFromQueryAsync(t => t.Id == id, true);
@ -244,7 +295,10 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateTrialClinicalTableQuestion(TrialClinicalTableQuestionDto inDto)
{
if (await _trialClinicalTableQuestionRepository.AnyAsync(x => x.QuestionId == inDto.QuestionId && x.Id != inDto.Id && x.QuestionName == inDto.QuestionName))
{
return ResponseOutput.NotOk(_localizer["ClinicalQuestion_Repeat"]);
}
var entity = await _trialClinicalTableQuestionRepository.InsertOrUpdateAsync(inDto, true);
return ResponseOutput.Ok(entity.Id.ToString());
@ -256,7 +310,7 @@ namespace IRaCIS.Core.Application.Service
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id:guid}")]
[HttpPost("{id:guid}")]
public async Task<IResponseOutput> DeleteTrialClinicalTableQuestion(Guid id)
{
var success = await _trialClinicalTableQuestionRepository.DeleteFromQueryAsync(t => t.Id == id, true);
@ -264,5 +318,127 @@ namespace IRaCIS.Core.Application.Service
}
#endregion
#region 同步系统问题
/// <summary>
/// 同步系统问题
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
public async Task SynchronizationQuestion(List<SynchronizationQuestionDto> inDto)
{
var trialClinicalId = inDto.Select(x => x.TrialClinicalId).ToList();
var systemClinicalId = inDto.Select(x => x.SystemClinicalId).ToList();
var questionRelationList =await _trialClinicalQuestionRepository.Where(x => trialClinicalId.Contains(x.TrialClinicalId)).Select(x => new QuestionDic()
{
SystemQuestionId=x.SystemClinicalQuestionId?? default(Guid),
TrialQuestionId=x.Id,
TrialClinicalId=x.TrialClinicalId,
}).ToListAsync();
var tableQuestionRelationList = await _trialClinicalTableQuestionRepository.Where(x => trialClinicalId.Contains(x.TrialClinicalId)).Select(x => new QuestionDic()
{
SystemQuestionId = x.SystemTableQuestionId ?? default(Guid),
TrialQuestionId = x.Id,
TrialClinicalId = x.TrialClinicalId,
}).ToListAsync();
var newTrialQuestionAll = await _systemClinicalQuestionRepository.Where(x => systemClinicalId.Contains(x.SystemClinicalId))
.ProjectTo<TrialClinicalQuestion>(_mapper.ConfigurationProvider).ToListAsync();
var newTrialTableQuestionAll = await _systemClinicalTableQuestionRepository.Where(x => systemClinicalId.Contains(x.SystemClinicalId))
.ProjectTo<TrialClinicalTableQuestion>(_mapper.ConfigurationProvider).ToListAsync();
List<TrialClinicalQuestion> addTrialDataList = new List<TrialClinicalQuestion>();
List<TrialClinicalTableQuestion> addTrialTableList = new List<TrialClinicalTableQuestion>();
foreach (var item in inDto)
{
var questionRelation = questionRelationList.Where(x=>x.TrialClinicalId==item.TrialClinicalId).ToDictionary(
x => x.SystemQuestionId,
x => x.TrialQuestionId
);
var newTrialQuestionList = newTrialQuestionAll.Where(x => x.SystemClinicalQuestionId == item.SystemClinicalId).ToList();
newTrialQuestionList.ForEach(x =>
{
if (questionRelation.ContainsKey(x.Id))
{
x.Id = questionRelation[x.Id];
}
else
{
var newid = NewId.NextGuid();
questionRelation.Add(x.Id, newid);
x.Id = newid;
}
x.TrialClinicalId = item.TrialClinicalId;
});
var copyNewQuestionList = newTrialQuestionList.Clone();
foreach (var x in newTrialQuestionList)
{
var question = x.Clone();
if (question.ParentId != null)
{
question.ParentId = questionRelation[question.ParentId ?? default(Guid)];
}
if (question.GroupId != null)
{
question.GroupId = questionRelation[question.GroupId ?? default(Guid)];
}
addTrialDataList.Add(question);
};
var tableQuestionRelation = tableQuestionRelationList.Where(x => x.TrialClinicalId == item.TrialClinicalId).ToDictionary(
x => x.SystemQuestionId,
x => x.TrialQuestionId
);
var newTrialTableQuestionList = newTrialTableQuestionAll.Where(x => x.TrialClinicalId == item.TrialClinicalId)
.ToList();
newTrialTableQuestionList.ForEach(x =>
{
if (tableQuestionRelation.ContainsKey(x.Id))
{
x.Id = tableQuestionRelation[x.Id];
}
else
{
var newid = NewId.NextGuid();
tableQuestionRelation.Add(x.Id, newid);
x.Id = newid;
}
});
foreach (var x in newTrialTableQuestionList)
{
var tableQuestion = x.Clone();
tableQuestion.TrialClinicalId = item.TrialClinicalId;
tableQuestion.QuestionId = copyNewQuestionList.Where(y => y.SystemClinicalQuestionId == x.QuestionId).Select(y => y.Id).FirstOrDefault();
addTrialTableList.Add(tableQuestion);
}
}
await _trialClinicalQuestionRepository.BatchDeleteNoTrackingAsync(x => trialClinicalId.Contains(x.TrialClinicalId));
await _trialClinicalQuestionRepository.AddRangeAsync(addTrialDataList);
await _trialClinicalTableQuestionRepository.BatchDeleteNoTrackingAsync(x => trialClinicalId.Contains(x.TrialClinicalId) );
await _trialClinicalTableQuestionRepository.AddRangeAsync(addTrialTableList);
}
#endregion
}
}
}

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

@ -13,6 +13,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public Guid? Id { get; set; }
/// <summary>
/// 是否应用
/// </summary>
public bool IsApply { get; set; } = false;
/// <summary>
/// 名称
@ -73,10 +77,23 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
//public List<int> CriterionEnumList { get; set; }
}
public class ApplySystemClinicalInDto
{
public Guid SystemClinicalId { get; set; }
}
public class ApplyTrialClinicalInDto
{
public Guid TrialClinicalId { get; set; }
}
public class ClinicalDataSystemSetAddOrEdit
{
public Guid? Id { get; set; }
/// <summary>
/// 是否应用
/// </summary>
public bool IsApply { get; set; } = false;
/// <summary>
/// 枚举

63
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
View File

@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public ClinicalQuestionType ClinicalQuestionTypeEnum { get; set; }
public string ClinicalQuestionType { get; set; }
/// <summary>
/// 问题标识
@ -88,6 +88,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 显示类型
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary>
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; }
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}
/// <summary>
@ -192,7 +207,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public ClinicalTableQuestionType ClinicalTableQuestionTypeEnum { get; set; }
public string ClinicalTableQuestionType { get; set; }
/// <summary>
/// 问题标识
@ -243,6 +258,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 外层问题Id
/// </summary>
public Guid QuestionId { get; set; }
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}
@ -314,8 +339,38 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
}
#endregion
#region 同步临床数据
public class SynchronizationQuestionDto
{
/// <summary>
/// 系统临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; }
/// <summary>
/// 项目临床数据Id
/// </summary>
public Guid TrialClinicalId { get; set; }
}
public class QuestionDic
{
public Guid SystemQuestionId { get; set; }
public Guid TrialQuestionId { get; set; }
/// <summary>
/// 项目临床数据Id
/// </summary>
public Guid TrialClinicalId { get; set; }
}
#endregion
}

25
IRaCIS.Core.Application/Service/Reading/Interface/IClinicalQuestionService.cs Normal file
View File

@ -0,0 +1,25 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-08-12 14:07:43
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Interfaces
{
/// <summary>
/// IClinicalQuestionService
/// </summary>
public interface IClinicalQuestionService
{
Task SynchronizationQuestion(List<SynchronizationQuestionDto> inDto);
}
}

2
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -980,7 +980,7 @@ namespace IRaCIS.Application.Services
x.TrialId = trialCriterion.TrialId;
});
var copyNewQuestionList = newTrialQuestionList.Clone();
var trialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id).ToListAsync();
// var trialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id).ToListAsync();
var needAddDatas = new List<ReadingQuestionTrial>();
foreach (var x in newTrialQuestionList)

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

@ -107,7 +107,7 @@ namespace IRaCIS.Application.Services
{
qusetionList = qusetionList.Where(x => x.ReadingCriterionPageId == null).ToList();
groupList = qusetionList.Where(x => x.Type == ReadingQestionType.Group || (x.ParentId == null && x.GroupName.IsNullOrEmpty())).ToList();
groupList = qusetionList.Where(x => x.Type == ReadingQestionType.Group || (x.ParentId == null && x.GroupId==null)).ToList();
groupList.ForEach(x =>
{
this.FindChildQuestion(x, qusetionList, tableQuestionList);
@ -152,7 +152,7 @@ namespace IRaCIS.Application.Services
TrialId = data.TrialId,
Type = data.Type,
ParentTriggerValue = data.ParentTriggerValue,
GroupName = data.GroupName,
GroupName = data.GroupName.LanguageName(data.GroupEnName, _userInfo.IsEn_Us),
QuestionName = data.QuestionName.LanguageName(data.QuestionEnName, _userInfo.IsEn_Us),
IsRequired = data.IsRequired,
ShowQuestion = data.ShowQuestion,
@ -196,7 +196,7 @@ namespace IRaCIS.Application.Services
[NonDynamicMethod]
public void FindChildQuestion(GetTrialReadingQuestionOutDto item, List<GetTrialReadingQuestionOutDto> questionlists, List<TableQuestionDataInfo> tableQuestions)
{
item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (item.Type == ReadingQestionType.Group && x.Type != ReadingQestionType.Group && x.ParentId == null && x.GroupName == item.GroupName)).ToList();
item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (item.Type == ReadingQestionType.Group && x.Type != ReadingQestionType.Group && x.ParentId == null && x.GroupId == item.Id)).ToList();
item.Childrens.AddRange(tableQuestions.Where(x => x.ReadingQuestionId == item.Id).Select(x => new GetTrialReadingQuestionOutDto

2
IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs
View File

@ -64,7 +64,7 @@ namespace IRaCIS.Core.Application.Service
AltKey = isnull ? false : key.AltKey,
CtrlKey = isnull ? false : key.CtrlKey,
MetaKey = isnull ? false : key.MetaKey,
ShiftKey = isnull ? false : key.ShiftKey,
ShiftKey = isnull && int.Parse(x.Code) == 11 ? true : isnull ? false : key.ShiftKey,
Text = isnull ? defaultkey.Text : key.Text,
Code = isnull ? defaultkey.Code : key.Code,
});

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

@ -29,6 +29,13 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialClinicalTableQuestion, TrialClinicalTableQuestionDto>();
CreateMap<TrialClinicalTableQuestionDto, TrialClinicalTableQuestion>();
CreateMap<SystemClinicalQuestion, TrialClinicalQuestion>()
.ForMember(d => d.SystemClinicalQuestionId, u => u.MapFrom(s => s.Id));
CreateMap<SystemClinicalTableQuestion, TrialClinicalTableQuestion>()
.ForMember(d => d.SystemTableQuestionId, u => u.MapFrom(s => s.Id));
#endregion
CreateMap<VisitTask, VisitTaskDto>();

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

@ -21,6 +21,7 @@ namespace IRaCIS.Core.Domain.Share
/// </summary>
public enum ClinicalTableQuestionMark
{
Test=1,
}
/// <summary>

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

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

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

@ -63,6 +63,12 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool IsConfirm { get; set; }
/// <summary>
/// 是否应用
/// </summary>
public bool IsApply { get; set; } = false;
/// <summary>
/// 上传角色
/// </summary>

16
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
View File

@ -35,7 +35,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public ClinicalQuestionType ClinicalQuestionTypeEnum { get; set; }
public string ClinicalQuestionType { get; set; }
/// <summary>
/// 问题标识
@ -102,6 +102,20 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary>
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; }
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}

16
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs
View File

@ -33,7 +33,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public ClinicalTableQuestionType ClinicalTableQuestionTypeEnum { get; set; }
public string ClinicalTableQuestionType { get; set; }
/// <summary>
/// 问题标识
@ -84,8 +84,18 @@ namespace IRaCIS.Core.Domain.Models
/// 外层问题Id
/// </summary>
public Guid QuestionId { get; set; }
}
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}
}

17
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
View File

@ -35,7 +35,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public ClinicalQuestionType ClinicalQuestionTypeEnum { get; set; }
public string ClinicalQuestionType { get; set; }
/// <summary>
/// 问题标识
@ -107,6 +107,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary>
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; }
/// <summary>
/// 自定义计算标记
/// </summary>
@ -116,6 +121,16 @@ namespace IRaCIS.Core.Domain.Models
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}

17
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs
View File

@ -33,7 +33,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public ClinicalTableQuestionType ClinicalTableQuestionTypeEnum { get; set; }
public string ClinicalTableQuestionType { get; set; }
/// <summary>
/// 问题标识
@ -85,6 +85,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid QuestionId { get; set; }
/// <summary>
/// 系统表格问题Id
/// </summary>
public Guid? SystemTableQuestionId { get; set; }
/// <summary>
/// 自定义计算标记
/// </summary>
@ -95,6 +100,16 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}