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

修改

Uat_Study
he 2022-06-17 14:53:15 +08:00
parent 665ca1b7ae
commit b1f629f56e
7 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -100,7 +100,11 @@ namespace IRaCIS.Core.API.Controllers
#endregion #endregion
/// <summary>
/// 提交阅片问题
/// </summary>
/// <param name="opt"></param>
/// <returns></returns>
[HttpPost, Route("Inspection/ReadingImageTask/SubmitVisitTaskQuestionsInDto")] [HttpPost, Route("Inspection/ReadingImageTask/SubmitVisitTaskQuestionsInDto")]
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> SubmitVisitTaskQuestions(DataInspectionDto<SubmitVisitTaskQuestionsInDto> opt) public async Task<IResponseOutput> SubmitVisitTaskQuestions(DataInspectionDto<SubmitVisitTaskQuestionsInDto> opt)

7
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -90,6 +90,13 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitVisitTaskQuestions(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SubmitVisitTaskQuestionsInDto})">
<summary>
提交阅片问题
</summary>
<param name="opt"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfigTrialBasicInfoConfirm(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.BasicTrialConfig})"> <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfigTrialBasicInfoConfirm(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.BasicTrialConfig})">
<summary> <summary>
配置 基础逻辑信息并确认 配置 基础逻辑信息并确认

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

@ -1285,7 +1285,7 @@
返回对象 返回对象
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialConfirmCriterionListOutDto.CriterionName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialConfirmCriterionListOutDto.ReadingQuestionCriterionTrialName">
<summary> <summary>
标准 标准
</summary> </summary>
@ -1295,6 +1295,11 @@
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.ReadingQuestionCriterionTrialId">
<summary>
项目标准Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.TrialId"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.TrialId">
<summary> <summary>
项目Id 项目Id
@ -4236,6 +4241,13 @@
IR影像阅片 IR影像阅片
</summary> </summary>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingImageFile(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingImgInDto)">
<summary>
获取阅片非Dicom文件
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetTrialConfirmCriterionList(IRaCIS.Core.Application.Service.Reading.Dto.GetConfirmCriterionInDto)"> <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetTrialConfirmCriterionList(IRaCIS.Core.Application.Service.Reading.Dto.GetConfirmCriterionInDto)">
<summary> <summary>
获取项目已确认的标准 获取项目已确认的标准
@ -4257,6 +4269,13 @@
<param name="trialReadingQuestion"></param> <param name="trialReadingQuestion"></param>
<param name="questionlists"></param> <param name="questionlists"></param>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.SubmitVisitTaskQuestionsInDto)">
<summary>
提交问题
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Application.Services.ReadingPeriodSetService"> <member name="T:IRaCIS.Application.Services.ReadingPeriodSetService">
<summary> <summary>
阅片期配置 阅片期配置

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetTrialReadingQuestionInDto public class GetTrialReadingQuestionInDto
{ {
[NotDefault] [NotDefault]
public Guid CriterionId { get; set; } public Guid ReadingQuestionCriterionTrialId { get; set; }
} }
/// <summary> /// <summary>

1
IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
View File

@ -6,7 +6,6 @@
using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Domain.Share.Reading;
namespace IRaCIS.Core.Application.Contracts namespace IRaCIS.Core.Application.Contracts
{ {

1
IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
View File

@ -6,7 +6,6 @@
using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Domain.Share.Reading;
namespace IRaCIS.Core.Application.Contracts namespace IRaCIS.Core.Application.Contracts
{ {

46
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -33,9 +33,9 @@ namespace IRaCIS.Application.Services
IMapper mapper, IMapper mapper,
IRepository<NoneDicomStudy> noneDicomStudyRepository, IRepository<NoneDicomStudy> noneDicomStudyRepository,
IRepository<VisitTask> visitTaskRepository, IRepository<VisitTask> visitTaskRepository,
IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository, IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository, IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
IRepository<ReadingQuestionTrial> readingQuestionTrialRepository IRepository<ReadingQuestionTrial> readingQuestionTrialRepository
) )
{ {
this.mapper = mapper; this.mapper = mapper;
@ -46,23 +46,27 @@ namespace IRaCIS.Application.Services
this._readingQuestionTrialRepository = readingQuestionTrialRepository; this._readingQuestionTrialRepository = readingQuestionTrialRepository;
} }
///// <summary> /// <summary>
///// 获取阅片非Dicom文件 /// 获取阅片非Dicom文件
///// </summary> /// </summary>
///// <param name="inDto"></param> /// <param name="inDto"></param>
///// <returns></returns> /// <returns></returns>
//[HttpPost] [HttpPost]
//public async Task<List<GetReadingImgOutDto>> GetReadingImageFile(GetReadingImgInDto inDto) public async Task<List<GetReadingImgOutDto>> GetReadingImageFile(GetReadingImgInDto inDto)
//{ {
// var subjectVisitId=await _visitTaskRepository.Where(x=>x.Id==inDto.VisitTaskId).Select(x=>x.vi) Guid? subjectVisitId = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.SourceSubjectVisitId).FirstOrDefaultAsync();
if (subjectVisitId == null)
// List<GetReadingImgOutDto> imgList =await _noneDicomStudyRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId) {
// .SelectMany(x => x.NoneDicomFileList).Select(x=> new GetReadingImgOutDto() { throw new QueryBusinessObjectNotExistException($"数据异常,当前任务没有访视Id");
// FileName=x.FileName, }
// Path=x.Path List<GetReadingImgOutDto> imgList = await _noneDicomStudyRepository.Where(x => x.SubjectVisitId == subjectVisitId)
// }).ToListAsync(); .SelectMany(x => x.NoneDicomFileList).Select(x => new GetReadingImgOutDto()
// return imgList; {
//} FileName = x.FileName,
Path = x.Path
}).ToListAsync();
return imgList;
}
/// <summary> /// <summary>
/// 获取项目已确认的标准 /// 获取项目已确认的标准
@ -89,7 +93,7 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<List<GetTrialReadingQuestionOutDto>> GetTrialReadingQuestion(GetTrialReadingQuestionInDto inDto) public async Task<List<GetTrialReadingQuestionOutDto>> GetTrialReadingQuestion(GetTrialReadingQuestionInDto inDto)
{ {
var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.CriterionId).ToListAsync(); var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId).ToListAsync();
List<GetTrialReadingQuestionOutDto> groupList = _mapper.Map<List<GetTrialReadingQuestionOutDto>>(qusetionList.Where(x => x.ParentId == null)); List<GetTrialReadingQuestionOutDto> groupList = _mapper.Map<List<GetTrialReadingQuestionOutDto>>(qusetionList.Where(x => x.ParentId == null));
groupList.ForEach(x => groupList.ForEach(x =>