diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index d8f3cfb71..2f765f9b6 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -51,6 +51,26 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Answer { get; set; } } + public class GetOncologyReadingInfoOutDto + { + public Guid VisitTaskId { get; set; } + + /// + /// 评估结果 + /// + public string EvaluationResult { get; set; } = string.Empty; + + /// + /// 评估原因 + /// + public string EvaluationReason { get; set; } = string.Empty; + } + + public class GetOncologyReadingInfoInDto + { + public Guid VisitTaskId { get; set; } + } + public class GetGlobalReadingInfoInDto { public Guid VisitTaskId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 9415baf81..759b83c66 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -87,6 +87,13 @@ namespace IRaCIS.Application.Services this._readingQuestionTrialRepository = readingQuestionTrialRepository; } + #region 肿瘤学阅片相关 + //public async Task GetOncologyReadingInfo(GetOncologyReadingInfoInDto inDto) + //{ + + //} + #endregion + #region 全局阅片相关 /// /// 保存全局阅片结果 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 5acde027d..1b66e170b 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -381,6 +381,7 @@ namespace IRaCIS.Core.Application.Contracts } + public bool IsClinicalReading { get; set; } /// /// 仲裁阅片 @@ -641,9 +642,9 @@ namespace IRaCIS.Core.Application.Contracts public class SetOncologySetInDto { /// - /// 项目标准ID + /// 项目ID /// - public Guid TrialCriterionId { get; set; } + public Guid TrialId { get; set; } /// /// 评估结果 @@ -671,7 +672,7 @@ namespace IRaCIS.Core.Application.Contracts public class GetOncologySetInDto { - public Guid TrialCriterionId { get; set; } + public Guid TrialId { get; set; } } public class GetTrialReadingInfoInDto diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 0a0b2c06f..ed4ffa209 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -121,7 +121,7 @@ namespace IRaCIS.Core.Application [HttpPost] public async Task GetOncologySet(GetOncologySetInDto inDto) { - var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialCriterionId && x.IsConfirm).FirstOrDefaultAsync(); + var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync(); if (trialCriterion == null) { throw new BusinessValidationFailedException("请先确认一个项目标准。"); @@ -140,14 +140,21 @@ namespace IRaCIS.Core.Application /// /// [HttpPost] - public async Task SetOncologySet(SetOncologySetInDto inDto) + public async Task SetOncologySet(SetOncologySetInDto inDto) { - await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial() + var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync(); + if (trialCriterion == null) + { + throw new BusinessValidationFailedException("请先确认一个项目标准。"); + } + await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(trialCriterion.Id, x => new ReadingQuestionCriterionTrial() { EvaluationResult = inDto.EvaluationResult, EvaluationReason = inDto.EvaluationReason, - }); + + var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync(); + return ResponseOutput.Ok(result); } /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingOncologyTaskInfo.cs new file mode 100644 index 000000000..69f427d0a --- /dev/null +++ b/IRaCIS.Core.Domain/Reading/ReadingOncologyTaskInfo.cs @@ -0,0 +1,62 @@ + +//-------------------------------------------------------------------- +// 此代码由T4模板自动生成 byzhouhang 20210918 +// 生成时间 2022-08-01 14:50:23 +// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +using System; +using IRaCIS.Core.Domain.Share; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +namespace IRaCIS.Core.Domain.Models +{ + /// + /// 阅片肿瘤学 + /// + [Table("ReadingOncologyTaskInfo")] + public class ReadingOncologyTaskInfo : Entity, IAuditAdd + { + + /// + /// 肿瘤学任务ID + /// + public Guid OncologyTaskId { get; set; } + + /// + /// 访视任务Id + /// + public Guid TaskId { get; set; } + + /// + /// 结果 + /// + public string EvaluationResult { get; set; } + + /// + /// 原因 + /// + public string EvaluationReason { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 创建人 + /// + public Guid CreateUserId { get; set; } + + /// + /// 项目Id + /// + public Guid TrialId { get; set; } + + /// + /// 受试者Id + /// + public Guid SubjectId { get; set; } + + } + + +} diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index ab94893d1..0c1c92605 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -209,7 +209,7 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet ReadingClinicalData { get; set; } - + public virtual DbSet ReadingOncologyTaskInfo { get; set; } public virtual DbSet ReadingGlobalTaskInfo { get; set; } public virtual DbSet ReadingQuestionCriterionSystem { get; set; } diff --git a/IRaCIS.Core.Test/DbHelper.ttinclude b/IRaCIS.Core.Test/DbHelper.ttinclude index 180a288e3..e25d06801 100644 --- a/IRaCIS.Core.Test/DbHelper.ttinclude +++ b/IRaCIS.Core.Test/DbHelper.ttinclude @@ -4,7 +4,7 @@ public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"; public static readonly string DbDatabase = "IRaCIS_New_Tet"; //ַ,ƴ - public static readonly string TableName = "SubjectCanceDoctor"; + public static readonly string TableName = "ReadingOncologyTaskInfo"; //ļ service Ƿҳ } #>