pm设置回退原因

Test_IRC_Net8
hang 2025-05-22 15:19:27 +08:00
parent 9748e70cdf
commit 04f91560b8
7 changed files with 19516 additions and 6 deletions

View File

@ -522,7 +522,7 @@
<param name="agreeReReadingCommand"></param> <param name="agreeReReadingCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.PMSetTaskBack(System.Guid,System.Guid)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.PMSetTaskBack(System.Guid,System.Guid,System.String)">
<summary> <summary>
PM 设置任务 退回 PM 设置任务 退回
</summary> </summary>
@ -14169,7 +14169,7 @@
返回 返回
</summary> </summary>
</member> </member>
<member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ConsistencyCheckConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Domain.Share.IUserInfo,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},AutoMapper.IMapper,Microsoft.Extensions.Localization.IStringLocalizer,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})"> <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ConsistencyCheckConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Domain.Share.IUserInfo,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},AutoMapper.IMapper,Microsoft.Extensions.Localization.IStringLocalizer,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary})">
<summary> <summary>
构造函数注入 构造函数注入
</summary> </summary>

View File

@ -2281,11 +2281,11 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// PM 设置任务 退回 /// PM 设置任务 退回
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPut("{trialId:guid}/{taskId:guid}")] [HttpPut("{trialId:guid}/{taskId:guid}/{pmBackReason}")]
[UnitOfWork] [UnitOfWork]
[TrialGlobalLimit("AfterStopCannNotOpt")] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId) public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId,string pmBackReason)
{ {
//var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.IsReadingTaskViewInOrder, t.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException(); //var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.IsReadingTaskViewInOrder, t.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
@ -2345,7 +2345,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
{ {
#region 有序 无序公用流程 #region 有序 无序公用流程
task.PMBackReason = pmBackReason;
//执行类似一致性核查回退流程 回退访视到影像上传流程 //执行类似一致性核查回退流程 回退访视到影像上传流程
await VisitBackAsync(task.SourceSubjectVisitId); await VisitBackAsync(task.SourceSubjectVisitId);

View File

@ -285,4 +285,7 @@ public class VisitTask : BaseFullAuditEntity
[Comment("通知IR加急阅片时间")] [Comment("通知IR加急阅片时间")]
public DateTime? ExpetidEmailNoticeTime { get; set; } public DateTime? ExpetidEmailNoticeTime { get; set; }
[Comment("退回原因")]
public string PMBackReason { get; set; }
} }

View File

@ -3487,12 +3487,27 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
else else
{ {
isDistinctionInterface = false;
isDistinctionInterface = false;
switch (_userInfo.RequestUrl) switch (_userInfo.RequestUrl)
{ {
//申请重阅 //申请重阅
case "VisitTask/applyReReading": case "VisitTask/applyReReading":
extraIdentification = "/" + (int)entity.ReReadingApplyState; extraIdentification = "/" + (int)entity.ReReadingApplyState;
//PM 申请重阅区分不了是否有SPM参与
if (entity.ReReadingApplyState== ReReadingApplyState.TrialGroupHaveApplyed)
{
var hasSPM = _dbContext.VisitTaskReReading.Any(t => t.OriginalReReadingTaskId == entity.Id);
if (hasSPM)
{
extraIdentification = "/" + 6;
}
}
break; break;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class pmReason : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "PMBackReason",
table: "VisitTask",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "",
comment: "退回原因");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PMBackReason",
table: "VisitTask");
}
}
}

View File

@ -14378,6 +14378,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasComment("在访视或者全局任务上记录 裁判任务的Id"); .HasComment("在访视或者全局任务上记录 裁判任务的Id");
b.Property<string>("PMBackReason")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("退回原因");
b.Property<string>("PastResultTaskIds") b.Property<string>("PastResultTaskIds")
.IsRequired() .IsRequired()
.HasMaxLength(2000) .HasMaxLength(2000)