Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
f72e3f4300
|
@ -9122,6 +9122,11 @@
|
||||||
修约小数点
|
修约小数点
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.IsViewStudyPart">
|
||||||
|
<summary>
|
||||||
|
是否查看检查部位
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.CriterionType">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.CriterionType">
|
||||||
<summary>
|
<summary>
|
||||||
标准类型
|
标准类型
|
||||||
|
@ -12163,6 +12168,11 @@
|
||||||
是否是系统数据
|
是否是系统数据
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitTaskDto.IsViewStudyPart">
|
||||||
|
<summary>
|
||||||
|
是否查看检查部位
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitTaskDto.ReadingCategory">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitTaskDto.ReadingCategory">
|
||||||
<summary>
|
<summary>
|
||||||
任务类型
|
任务类型
|
||||||
|
@ -13098,6 +13108,13 @@
|
||||||
<param name="inDto"></param>
|
<param name="inDto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.ViewStudyPart(IRaCIS.Core.Application.Service.Reading.Dto.ViewStudyPartInDto)">
|
||||||
|
<summary>
|
||||||
|
查看检查部位
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.DeleteSingleTableQuestionMark(IRaCIS.Core.Application.Service.Reading.Dto.DeleteSingleTableQuestionMarkInDto,System.String)">
|
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.DeleteSingleTableQuestionMark(IRaCIS.Core.Application.Service.Reading.Dto.DeleteSingleTableQuestionMarkInDto,System.String)">
|
||||||
<summary>
|
<summary>
|
||||||
删除单个表格问题标记
|
删除单个表格问题标记
|
||||||
|
|
|
@ -446,6 +446,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class ViewStudyPartInDto
|
||||||
|
{
|
||||||
|
public Guid VisitTaskId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class DeleteSingleTableQuestionMarkInDto
|
public class DeleteSingleTableQuestionMarkInDto
|
||||||
{
|
{
|
||||||
[NotDefault]
|
[NotDefault]
|
||||||
|
@ -1863,6 +1868,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? DigitPlaces { get; set; } = 2;
|
public int? DigitPlaces { get; set; } = 2;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否查看检查部位
|
||||||
|
/// </summary>
|
||||||
|
public bool IsViewStudyPart { get; set; } = false;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 标准类型
|
/// 标准类型
|
||||||
|
|
|
@ -12,6 +12,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public string TaskBlindName { get; set; } = string.Empty;
|
public string TaskBlindName { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否查看检查部位
|
||||||
|
/// </summary>
|
||||||
|
public bool IsViewStudyPart { get; set; } = false;
|
||||||
|
|
||||||
//任务来源访视Id 方便回更访视读片状态
|
//任务来源访视Id 方便回更访视读片状态
|
||||||
public Guid? SourceSubjectVisitId { get; set; }
|
public Guid? SourceSubjectVisitId { get; set; }
|
||||||
public Guid? SouceReadModuleId { get; set; }
|
public Guid? SouceReadModuleId { get; set; }
|
||||||
|
|
|
@ -94,6 +94,22 @@ namespace IRaCIS.Core.Application.Service
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查看检查部位
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inDto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<bool> ViewStudyPart(ViewStudyPartInDto inDto)
|
||||||
|
{
|
||||||
|
await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
|
||||||
|
{
|
||||||
|
IsViewStudyPart = true,
|
||||||
|
});
|
||||||
|
return await _visitTaskRepository.SaveChangesAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 删除单个表格问题标记
|
/// 删除单个表格问题标记
|
||||||
|
@ -3625,6 +3641,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
task.ReadingVersionEnum = criterionInfo.ReadingVersionEnum;
|
task.ReadingVersionEnum = criterionInfo.ReadingVersionEnum;
|
||||||
task.ReadingToolList = criterionInfo.ReadingToolList;
|
task.ReadingToolList = criterionInfo.ReadingToolList;
|
||||||
task.IsExistUnprocessedFeedback = await _userFeedBackRepository.AnyAsync(x => x.VisitTaskId == task.VisitTaskId && x.State == 0);
|
task.IsExistUnprocessedFeedback = await _userFeedBackRepository.AnyAsync(x => x.VisitTaskId == task.VisitTaskId && x.State == 0);
|
||||||
|
task.IsViewStudyPart= visitTaskInfo.IsViewStudyPart;
|
||||||
// 添加默认答案
|
// 添加默认答案
|
||||||
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
||||||
{
|
{
|
||||||
|
|
|
@ -297,6 +297,11 @@ public class VisitTask : BaseFullAuditEntity
|
||||||
[Comment("退回原因")]
|
[Comment("退回原因")]
|
||||||
public string PMBackReason { get; set; }
|
public string PMBackReason { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否查看检查部位
|
||||||
|
/// </summary>
|
||||||
|
public bool IsViewStudyPart { get; set; } = false;
|
||||||
|
|
||||||
#region 完全随机增加字段
|
#region 完全随机增加字段
|
||||||
|
|
||||||
[Comment("完全随机阅片号")]
|
[Comment("完全随机阅片号")]
|
||||||
|
|
19987
IRaCIS.Core.Infra.EFCore/Migrations/20250916075820_ViewStudyPart.Designer.cs
generated
Normal file
19987
IRaCIS.Core.Infra.EFCore/Migrations/20250916075820_ViewStudyPart.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,29 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class ViewStudyPart : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "IsViewStudyPart",
|
||||||
|
table: "VisitTask",
|
||||||
|
type: "bit",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "IsViewStudyPart",
|
||||||
|
table: "VisitTask");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -14729,6 +14729,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
b.Property<bool>("IsUrgent")
|
b.Property<bool>("IsUrgent")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<bool>("IsViewStudyPart")
|
||||||
|
.HasColumnType("bit");
|
||||||
|
|
||||||
b.Property<string>("JudgeResultImagePath")
|
b.Property<string>("JudgeResultImagePath")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasMaxLength(1000)
|
.HasMaxLength(1000)
|
||||||
|
|
Loading…
Reference in New Issue