Compare commits
No commits in common. "ae1b2523b12dccc537316f0c4b8d5d48f04baa3d" and "81abd9622f3a5d1d284ddd87bd28076e3b66d159" have entirely different histories.
ae1b2523b1
...
81abd9622f
|
|
@ -267,9 +267,8 @@ namespace IRaCIS.Core.Application.Image.QA
|
|||
//已经有在申请的影像回退记录
|
||||
throw new BusinessValidationFailedException(_localizer["QCOperation_HaveApplyedImageBack"]);
|
||||
}
|
||||
var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
|
||||
|
||||
var newRecord = new SubjectVisitImageBackRecord() { SubjectVisitId = subjectVisitId,SubmitTime=sv.SubmitTime,EarliestScanDate=sv.EarliestScanDate,LatestScanDate=sv.LatestScanDate };
|
||||
var newRecord = new SubjectVisitImageBackRecord() { SubjectVisitId = subjectVisitId };
|
||||
|
||||
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -744,7 +744,10 @@ namespace IRaCIS.Core.Application.Service
|
|||
.ForMember(d => d.VisitNum, u => u.MapFrom(t => t.SubjectVisit.VisitNum))
|
||||
.ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.SubjectVisit.TrialSite.TrialSiteCode))
|
||||
.ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName))
|
||||
.ForMember(d => d.SubmitTime, u => u.MapFrom(s => s.SubjectVisit.SubmitTime))
|
||||
.ForMember(d => d.IsUrgent, u => u.MapFrom(s => s.SubjectVisit.IsUrgent))
|
||||
.ForMember(d => d.EarliestScanDate, u => u.MapFrom(s => s.SubjectVisit.EarliestScanDate))
|
||||
.ForMember(d => d.LatestScanDate, u => u.MapFrom(s => s.SubjectVisit.LatestScanDate))
|
||||
.ForMember(d => d.CreateUserName, u => u.MapFrom(s => s.CreateUserRole.UserName))
|
||||
.ForMember(d => d.CreateUserFullName, u => u.MapFrom(s => s.CreateUserRole.FullName));
|
||||
|
||||
|
|
|
|||
|
|
@ -198,15 +198,6 @@ public class SubjectVisitImageBackRecord : BaseFullAuditEntity
|
|||
|
||||
public Guid SubjectVisitId { get; set; }
|
||||
|
||||
public DateTime? SubmitTime { get; set; }
|
||||
|
||||
public DateTime? EarliestScanDate { get; set; }
|
||||
|
||||
[Comment("最晚拍片日期")]
|
||||
public DateTime? LatestScanDate { get; set; }
|
||||
|
||||
|
||||
|
||||
public ImageBackApplyEnum ApplyUserRole { get; set; }
|
||||
|
||||
[Comment("影像上传 回退")]
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,50 +0,0 @@
|
|||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class backAddFiled : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "EarliestScanDate",
|
||||
table: "SubjectVisitImageBackRecord",
|
||||
type: "datetime2",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "LatestScanDate",
|
||||
table: "SubjectVisitImageBackRecord",
|
||||
type: "datetime2",
|
||||
nullable: true,
|
||||
comment: "最晚拍片日期");
|
||||
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "SubmitTime",
|
||||
table: "SubjectVisitImageBackRecord",
|
||||
type: "datetime2",
|
||||
nullable: true);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "EarliestScanDate",
|
||||
table: "SubjectVisitImageBackRecord");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "LatestScanDate",
|
||||
table: "SubjectVisitImageBackRecord");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "SubmitTime",
|
||||
table: "SubjectVisitImageBackRecord");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -9078,23 +9078,13 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
b.Property<Guid>("CreateUserId")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
b.Property<DateTime?>("EarliestScanDate")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<int>("ImageBackState")
|
||||
.HasColumnType("int")
|
||||
.HasComment("影像上传 回退");
|
||||
|
||||
b.Property<DateTime?>("LatestScanDate")
|
||||
.HasColumnType("datetime2")
|
||||
.HasComment("最晚拍片日期");
|
||||
|
||||
b.Property<Guid>("SubjectVisitId")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
b.Property<DateTime?>("SubmitTime")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<DateTime>("UpdateTime")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue