Compare commits
No commits in common. "37d798627aeadc30811d8bd5cb7fc83e72798045" and "70443b7b8d35b7ebb55f17d9e7d7015b09af8035" have entirely different histories.
37d798627a
...
70443b7b8d
|
|
@ -42,7 +42,6 @@ public static class SendEmailHelper
|
||||||
|
|
||||||
await smtp.DisconnectAsync(true);
|
await smtp.DisconnectAsync(true);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|
|
||||||
|
|
@ -2490,10 +2490,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public Guid VisitTaskId { get; set; }
|
public Guid VisitTaskId { get; set; }
|
||||||
public Guid? StudyId { get; set; }
|
public Guid? StudyId { get; set; }
|
||||||
|
|
||||||
public string MarkTool { get; set; }
|
|
||||||
|
|
||||||
public string OrderMarkName { get; set; }
|
|
||||||
|
|
||||||
public Guid? MarkId { get; set; }
|
public Guid? MarkId { get; set; }
|
||||||
public Guid? NoneDicomFileId { get; set; }
|
public Guid? NoneDicomFileId { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,13 +67,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var mark = await _readingNoneDicomMarkRepository.Where(x => x.MarkId == inDto.MarkId).FirstOrDefaultAsync();
|
var mark = await _readingNoneDicomMarkRepository.Where(x => x.MarkId == inDto.MarkId).FirstOrDefaultAsync();
|
||||||
if (mark != null)
|
if (mark != null)
|
||||||
{
|
{
|
||||||
if (mark.MeasureData != inDto.MeasureData || mark.Path != inDto.Path|| mark.OrderMarkName != inDto.OrderMarkName || mark.MarkTool != inDto.MarkTool)
|
if (mark.MeasureData != inDto.MeasureData || mark.Path != inDto.Path)
|
||||||
{
|
{
|
||||||
await _readingNoneDicomMarkRepository.UpdatePartialFromQueryAsync(x => x.Id == mark.Id, u => new Domain.Models.ReadingNoneDicomMark()
|
await _readingNoneDicomMarkRepository.UpdatePartialFromQueryAsync(x => x.Id == mark.Id, u => new Domain.Models.ReadingNoneDicomMark()
|
||||||
{
|
{
|
||||||
MeasureData = inDto.MeasureData,
|
MeasureData = inDto.MeasureData,
|
||||||
MarkTool=inDto.MarkTool,
|
|
||||||
OrderMarkName=inDto.OrderMarkName,
|
|
||||||
Path = inDto.Path
|
Path = inDto.Path
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -86,8 +84,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
Id = NewId.NextGuid(),
|
Id = NewId.NextGuid(),
|
||||||
VisitTaskId = inDto.VisitTaskId,
|
VisitTaskId = inDto.VisitTaskId,
|
||||||
StudyId = inDto.StudyId,
|
StudyId = inDto.StudyId,
|
||||||
MarkTool = inDto.MarkTool,
|
|
||||||
OrderMarkName = inDto.OrderMarkName,
|
|
||||||
NoneDicomFileId = inDto.NoneDicomFileId,
|
NoneDicomFileId = inDto.NoneDicomFileId,
|
||||||
Path = inDto.Path,
|
Path = inDto.Path,
|
||||||
MeasureData = inDto.MeasureData,
|
MeasureData = inDto.MeasureData,
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,6 @@ public class ReadingNoneDicomMark : BaseAddAuditEntity
|
||||||
[MaxLength]
|
[MaxLength]
|
||||||
public string MeasureData { get; set; } = string.Empty;
|
public string MeasureData { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string MarkTool { get; set; }
|
|
||||||
|
|
||||||
public string OrderMarkName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 标记的唯一标识符
|
/// 标记的唯一标识符
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,42 +0,0 @@
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class NoneMark : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "MarkTool",
|
|
||||||
table: "ReadingNoneDicomMark",
|
|
||||||
type: "nvarchar(400)",
|
|
||||||
maxLength: 400,
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "");
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "OrderMarkName",
|
|
||||||
table: "ReadingNoneDicomMark",
|
|
||||||
type: "nvarchar(400)",
|
|
||||||
maxLength: 400,
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "MarkTool",
|
|
||||||
table: "ReadingNoneDicomMark");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "OrderMarkName",
|
|
||||||
table: "ReadingNoneDicomMark");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -5716,11 +5716,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
b.Property<Guid?>("MarkId")
|
b.Property<Guid?>("MarkId")
|
||||||
.HasColumnType("uniqueidentifier");
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
b.Property<string>("MarkTool")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(400)
|
|
||||||
.HasColumnType("nvarchar(400)");
|
|
||||||
|
|
||||||
b.Property<string>("MeasureData")
|
b.Property<string>("MeasureData")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("nvarchar(max)");
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
@ -5728,11 +5723,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
b.Property<Guid?>("NoneDicomFileId")
|
b.Property<Guid?>("NoneDicomFileId")
|
||||||
.HasColumnType("uniqueidentifier");
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
b.Property<string>("OrderMarkName")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(400)
|
|
||||||
.HasColumnType("nvarchar(400)");
|
|
||||||
|
|
||||||
b.Property<string>("Path")
|
b.Property<string>("Path")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasMaxLength(400)
|
.HasMaxLength(400)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue