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

修改一版

Uat_Study
he 2022-06-14 10:12:24 +08:00
parent 4f1fee1ab7
commit 63c02e4b8b
4 changed files with 118 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4081,24 +4081,23 @@
阅片问题.标准
</summary>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionCriterionSystem(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto)">
<summary>
新增修改系统问题标准
</summary>
<param name="indto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetReadingQuestionCriterionSystemList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemViewInDto)">
<summary>
获取系统问题标准
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.DeleteReadingQuestionCriterionSystem(System.Guid)">
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetSystemReadingQuestionCriterionIsIsEnable(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsEnable)">
<summary>
删除系统问题标准
设置系统问题标准是否生效
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddSystemQuestionCriterion">
<summary>
添加系统qc问题标准
</summary>
<param name="readingQuestionCriterionSystemId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionSystem(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto)">
@ -4121,6 +4120,12 @@
<param name="readingQuestionSystemId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddSystemDataToTrila(System.Guid)">
<summary>
添加系统数据到项目里面
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionCriterionTrial(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto)">
<summary>
新增修改项目问题标准（项目）

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

@ -54,6 +54,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string CriterionName { get; set; }=String.Empty;
}
public class CriterionList
{
public Guid Id { get; set; }
public string Value { get; set; }
}
public class SetSystemReadingQuestionCriterionIsIsEnable
{
[NotDefault]
public Guid ReadingQuestionCriterionSystemId { get; set; }
[NotDefault]
public bool IsEnable { get; set; }
}
/// <summary>
///

4
IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
View File

@ -39,8 +39,8 @@ namespace IRaCIS.Application.Services
IRepository<Subject> subjectRepository,
IRepository<VisitStage> visitstageRepository,
IRepository<User> UserRepository,
IRepository<Trial> trialRepository,
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
IRepository<Trial> trialRepository,
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
IRepository<ReadModuleView> readModuleViewRepository,
IRepository<DicomInstance> dicomInstanceRepository,
IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository,

104
IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
View File

@ -11,6 +11,7 @@ using IRaCIS.Core.Domain.Share.Reading;
using MassTransit;
using IRaCIS.Core.Application.Service.Reading;
using IRaCIS.Core.Infra.EFCore.Common;
using Panda.DynamicWebApi.Attributes;
namespace IRaCIS.Application.Services
{
@ -28,6 +29,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
private readonly IRepository<Dictionary> _dictionaryRepository;
private readonly IRepository<PreviousPDF> _previousPDFRepository;
public ReadingQuestionService(IRepository<SubjectVisit> subjectVisitRepository,
@ -38,6 +40,7 @@ namespace IRaCIS.Application.Services
IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
IRepository<Dictionary> dictionaryRepository,
IRepository<PreviousPDF> previousPDFRepository
)
{
@ -48,20 +51,21 @@ namespace IRaCIS.Application.Services
this._readingQuestionTrialRepository = readingQuestionTrialRepository;
_clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
this._dictionaryRepository = dictionaryRepository;
this._previousPDFRepository = previousPDFRepository;
}
/// <summary>
/// 新增修改系统问题标准
/// </summary>
/// <param name="indto"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateReadingQuestionCriterionSystem(AddOrUpdateReadingQuestionCriterionSystemInDto indto)
{
var entity = await _readingQuestionCriterionSystemRepository.InsertOrUpdateAsync(indto,true);
return ResponseOutput.Ok(entity.Id.ToString());
}
///// <summary>
///// 新增修改系统问题标准
///// </summary>
///// <param name="indto"></param>
///// <returns></returns>
//[HttpPost]
//public async Task<IResponseOutput> AddOrUpdateReadingQuestionCriterionSystem(AddOrUpdateReadingQuestionCriterionSystemInDto indto)
//{
// var entity = await _readingQuestionCriterionSystemRepository.InsertOrUpdateAsync(indto,true);
// return ResponseOutput.Ok(entity.Id.ToString());
//}
/// <summary>
/// 获取系统问题标准
@ -70,6 +74,7 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<PageOutput<ReadingQuestionCriterionSystemView>> GetReadingQuestionCriterionSystemList(ReadingQuestionCriterionSystemViewInDto inDto)
{
await AddSystemQuestionCriterion();
var query= _readingQuestionCriterionSystemRepository.AsQueryable()
.WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName))
.ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider);
@ -78,18 +83,70 @@ namespace IRaCIS.Application.Services
}
/// <summary>
/// 删除系统问题标准
/// 设置系统问题标准是否生效
/// </summary>
/// <param name="readingQuestionCriterionSystemId"></param>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpDelete("{readingQuestionCriterionSystemId:guid}")]
public async Task<IResponseOutput> DeleteReadingQuestionCriterionSystem(Guid readingQuestionCriterionSystemId)
public async Task<IResponseOutput> SetSystemReadingQuestionCriterionIsIsEnable(SetSystemReadingQuestionCriterionIsIsEnable inDto)
{
await _readingQuestionCriterionSystemRepository.DeleteFromQueryAsync(t => t.Id == readingQuestionCriterionSystemId);
var success = await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
return ResponseOutput.Result(success);
await _readingQuestionCriterionSystemRepository.UpdatePartialFromQueryAsync(inDto.ReadingQuestionCriterionSystemId, x => new ReadingQuestionCriterionSystem()
{
IsEnable = inDto.IsEnable
});
var result =await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
return ResponseOutput.Ok(result);
}
/// <summary>
/// 添加系统qc问题标准
/// </summary>
/// <returns></returns>
public async Task AddSystemQuestionCriterion()
{
var useSystemQuestionCriterionIds = _readingQuestionCriterionSystemRepository.Select(x => x.CriterionId);
var dictionaryParentId =await _dictionaryRepository.Where(x => x.Code == "ReadingStandard").Select(x => x.Id).FirstOrDefaultAsync();
var criterionList = await _dictionaryRepository.Where(x => x.ParentId == dictionaryParentId && !useSystemQuestionCriterionIds.Contains(x.Id))
.Select(x => new CriterionList()
{
Id = x.Id,
Value = x.Value
}).ToListAsync();
List<ReadingQuestionCriterionSystem> needAddCriterionList = new List<ReadingQuestionCriterionSystem>();
criterionList.ForEach(x =>
{
needAddCriterionList.Add(new ReadingQuestionCriterionSystem()
{
CriterionId = x.Id,
CriterionName = x.Value,
IsEnable = false,
});
});
await _readingQuestionCriterionSystemRepository.AddRangeAsync(needAddCriterionList);
await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
}
///// <summary>
///// 删除系统问题标准
///// </summary>
///// <param name="readingQuestionCriterionSystemId"></param>
///// <returns></returns>
//[HttpDelete("{readingQuestionCriterionSystemId:guid}")]
//public async Task<IResponseOutput> DeleteReadingQuestionCriterionSystem(Guid readingQuestionCriterionSystemId)
//{
// await _readingQuestionCriterionSystemRepository.DeleteFromQueryAsync(t => t.Id == readingQuestionCriterionSystemId);
// var success = await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
// return ResponseOutput.Result(success);
//}
/// <summary>
@ -133,7 +190,18 @@ namespace IRaCIS.Application.Services
return ResponseOutput.Result(success);
}
/// <summary>
/// 添加系统数据到项目里面
/// </summary>
/// <returns></returns>
[NonDynamicMethod]
private async Task AddSystemDataToTrila(Guid trialId)
{
var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null)
.Select(x => x.ReadingQuestionCriterionSystemId);
var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)).ToListAsync();
}
/// <summary>