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

修改

Uat_Study
he 2022-11-16 15:14:24 +08:00
parent 261fba4185
commit 486a13a026
3 changed files with 74 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3612,6 +3612,21 @@
表格问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.CustomCalculateMark">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.IsDepend">
<summary>
IsDepend
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.CalculateQuestions">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ValueType">
<summary>
数值类型
@ -3933,6 +3948,16 @@
单位
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.CustomCalculateMark">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.CalculateQuestions">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ValueType">
<summary>
数值类型
@ -4473,6 +4498,16 @@
单位
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.CustomCalculateMark">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.CalculateQuestions">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemCriterionSelectDto.Id">
<summary>
返回的对象
@ -6648,6 +6683,16 @@
序号标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.CustomCalculateMark">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.CalculateQuestions">
<summary>
自定义计算标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName">
<summary>
问题名称
@ -7052,12 +7097,13 @@
<param name="isReading"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Services.SubjectVisitService.GetReadingVisitStudyList(System.Guid,System.Guid)">
<member name="M:IRaCIS.Core.Application.Services.SubjectVisitService.GetReadingVisitStudyList(System.Guid,System.Guid,System.Guid)">
<summary>
获取访视下的Dicom 检查信息 分所有的， 阅片的 不阅片 isReading : 0 查询所有 1 查询仅仅阅片的
</summary>
<param name="trialId"></param>
<param name="sujectVisitId"></param>
<param name="visitTaskId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Services.SubjectVisitService.SetSVExecuted(System.Guid)">
@ -8502,6 +8548,20 @@
阅片问题.标准
</summary>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCalculateQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateQuestionsInDto)">
<summary>
获取问题
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCalculateTableQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsInDto)">
<summary>
获取表格问题
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetSystemGroupNameList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialGroupNameListInDto)">
<summary>
获取系统问题分组

6
IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
View File

@ -182,6 +182,12 @@ namespace IRaCIS.Core.Application.Contracts
}
public class GetReadingVisitStudyListIndto
{
public Guid TrialId { get; set; }
public Guid SujectVisitId { get; set; }
public Guid? VisitTaskId { get; set; }
}
public class VisitStudyDTO
{

17
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -234,20 +234,17 @@ namespace IRaCIS.Core.Application.Services
/// <summary>
/// 获取访视下的Dicom 检查信息 分所有的， 阅片的 不阅片 isReading : 0 查询所有 1 查询仅仅阅片的
/// </summary>
/// <param name="trialId"></param>
/// <param name="sujectVisitId"></param>
/// <param name="visitTaskId"></param>
/// <param name="indto"></param>
/// <returns></returns>
[HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}/{visitTaskId}")]
[AllowAnonymous]
public async Task<List<VisitStudyDTO>> GetReadingVisitStudyList(Guid trialId, Guid sujectVisitId,Guid visitTaskId)
[HttpPost]
public async Task<List<VisitStudyDTO>> GetReadingVisitStudyList(GetReadingVisitStudyListIndto indto)
{
var result = new List<VisitStudyDTO>();
var thisRowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == visitTaskId && x.StudyId != null).ToListAsync();
var thisRowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).ToListAsync();
var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
if(taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
{
@ -285,7 +282,7 @@ namespace IRaCIS.Core.Application.Services
}
var studyList = await _repository.Where<DicomStudy>(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).Select(k => new VisitStudyDTO()
var studyList = await _repository.Where<DicomStudy>(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId).Select(k => new VisitStudyDTO()
{
InstanceCount = k.InstanceCount,
Modalities = k.Modalities,
@ -315,7 +312,7 @@ namespace IRaCIS.Core.Application.Services
// 非Dicom
var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == trialId && x.SubjectVisitId == sujectVisitId).ToListAsync();
var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId).ToListAsync();
List<VisitStudyDTO> noDicomStudyList = noDicomList.Select(x => new VisitStudyDTO()