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

修改一版

Uat_Study
he 2022-07-05 16:59:38 +08:00
parent f567036f4d
commit 707ecdb05f
5 changed files with 119 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1487,6 +1487,31 @@
是否申请重阅
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListInDto.TrialId">
<summary>
项目Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.AuditState">
<summary>
审核 质询状态
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.ReadingCategory">
<summary>
阅片类别
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.AuditAdviceEnum">
<summary>
审核建议
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.DoctorUserIdeaEnum">
<summary>
阅片人是否认同
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.Content">
<summary>
对话内容
@ -2471,6 +2496,13 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingMedicalReviewService.GetIRMedicalFeedbackList(IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListInDto)">
<summary>
获取IR医学审核信息
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService">
<summary>
医学审核问题

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

@ -32,6 +32,51 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsApplyHeavyReading { get; set; } = false;
}
public class GetIRMedicalFeedbackListInDto:PageInput
{
/// <summary>
/// 项目Id
/// </summary>
[NotDefault]
public Guid TrialId { get; set; }
}
public class GetIRMedicalFeedbackListOutDto
{
public Guid Id { get; set; }
public bool IsUrgent { get; set; }
/// <summary>
/// 审核 质询状态
/// </summary>
public MedicalReviewAuditState AuditState { get; set; }
public string SubjectCode { get; set; }
public string TaskBlindName { get; set; }
/// <summary>
/// 阅片类别
/// </summary>
public ReadingCategory ReadingCategory { get; set; }
public DateTime? FirstReplyTime { get; set; }
public DateTime? LastReplyTime { get; set; }
/// <summary>
/// 审核建议
/// </summary>
public AuditAdvice AuditAdviceEnum { get; set; }
/// <summary>
/// 阅片人是否认同
/// </summary>
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
}
public class FinishMedicalReviewInDto
{
public Guid TaskMedicalReviewId { get; set; }

33
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
View File

@ -149,8 +149,6 @@ namespace IRaCIS.Core.Application.Service
medicalReviewInfo.TaskList.ForEach(x =>
{
x.OtherTaskId = otherTask.Where(y => y.SouceReadModuleId == x.SouceReadModuleId && y.SourceSubjectVisitId == x.SourceSubjectVisitId).Select(y => y.TaskId).FirstOrDefault();
});
}
@ -413,5 +411,36 @@ namespace IRaCIS.Core.Application.Service
}
/// <summary>
/// 获取IR医学审核信息
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<PageOutput<GetIRMedicalFeedbackListOutDto>> GetIRMedicalFeedbackList(GetIRMedicalFeedbackListInDto inDto)
{
var taskMedicalReviewquery = _taskMedicalReviewRepository.Where(x => x.TrialId == inDto.TrialId).Include(x => x.VisitTask)
.Where(x => x.VisitTask.DoctorUserId == _userInfo.Id)
.Select(x => new GetIRMedicalFeedbackListOutDto
{
Id = x.Id,
IsUrgent = x.VisitTask.IsUrgent,
AuditState = x.AuditState,
SubjectCode = x.VisitTask.BlindSubjectCode == string.Empty ? x.VisitTask.Subject.Code : x.VisitTask.BlindSubjectCode,
TaskBlindName = x.VisitTask.TaskBlindName,
ReadingCategory = x.VisitTask.ReadingCategory,
FirstReplyTime = x.ReadingMedicalReviewDialogList.Min(x => x.CreateTime),
LastReplyTime = x.ReadingMedicalReviewDialogList.Max(x => x.CreateTime),
AuditAdviceEnum = x.AuditAdviceEnum,
DoctorUserIdeaEnum = x.DoctorUserIdeaEnum
});
var result=await taskMedicalReviewquery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(GetIRMedicalFeedbackListOutDto.AuditState) : inDto.SortField,
inDto.Asc);
return result;
}
}
}

7
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
View File

@ -7,6 +7,8 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -140,6 +142,11 @@ namespace IRaCIS.Core.Domain.Models
public string FileName { get; set; } = string.Empty;
public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
}
}

4
IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
View File

@ -95,6 +95,10 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string FileName { get; set; } = string.Empty;
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
}