计算天数按照30.44算,增加控制字段
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2026-01-05 14:27:23 +08:00
parent 834f6be548
commit 8803a5f5b2
7 changed files with 21425 additions and 3 deletions

View File

@ -121,7 +121,7 @@ namespace IRaCIS.Core.Application.ViewModel
{
if (DaysDiff.HasValue)
{
return Math.Round(DaysDiff.Value / 30.0, 1, MidpointRounding.AwayFromZero);
return Math.Round(DaysDiff.Value / 30.44, 2, MidpointRounding.AwayFromZero);
}
return null;
}

View File

@ -281,6 +281,8 @@ namespace IRaCIS.Application.Contracts
public bool IsIQCAutoNextTask { get; set; }
public bool IsExternalViewTrialChart { get; set; }
#endregion
}

View File

@ -1546,14 +1546,14 @@ namespace IRaCIS.Core.Application
[AllowAnonymous]
public async Task<TrialConfigInfo> GetTrialExtralConfig(Guid trialId)
{
var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault();
var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr,t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault();
var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
var trialConfig = _mapper.Map<TrialConfigInfo>(extralConfig);
trialConfig.TrialObjectNameList = extralObj.TrialObjectNameList;
trialConfig.IsExternalViewTrialChart = extralObj.IsExternalViewTrialChart;
trialConfig.CollectImagesEnum = extralObj.CollectImagesEnum;
trialConfig.IsIQCAutoNextTask = extralObj.IsIQCAutoNextTask;

View File

@ -298,6 +298,9 @@ public partial class Trial : BaseFullDeleteAuditEntity
[Comment("SPM 参与重阅审批")]
public bool IsSPMJoinReReadingApproval { get; set; }
[Comment("外部人员 查看项目报表")]
public bool IsExternalViewTrialChart { get; set; }
[Comment("阅片任务产生之前 采集影像")]
public CollectImagesType CollectImagesEnum { get; set; }

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,51 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class addTrialChart : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsExternalViewTrialChart",
table: "Trial",
type: "bit",
nullable: false,
defaultValue: false,
comment: "外部人员 查看项目报表");
//migrationBuilder.CreateIndex(
// name: "IX_DicomInstance_TrialId",
// table: "DicomInstance",
// column: "TrialId");
//migrationBuilder.AddForeignKey(
// name: "FK_DicomInstance_Trial_TrialId",
// table: "DicomInstance",
// column: "TrialId",
// principalTable: "Trial",
// principalColumn: "Id",
// onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_DicomInstance_Trial_TrialId",
table: "DicomInstance");
migrationBuilder.DropIndex(
name: "IX_DicomInstance_TrialId",
table: "DicomInstance");
migrationBuilder.DropColumn(
name: "IsExternalViewTrialChart",
table: "Trial");
}
}
}

View File

@ -1264,6 +1264,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.HasIndex("StudyId");
b.HasIndex("TrialId");
b.ToTable("DicomInstance", t =>
{
t.HasComment("归档 - Instance表");
@ -11984,6 +11986,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("bit")
.HasComment("是否有 入组性确认");
b.Property<bool>("IsExternalViewTrialChart")
.HasColumnType("bit")
.HasComment("外部人员 查看项目报表");
b.Property<bool>("IsHaveFirstGiveMedicineDate")
.HasColumnType("bit")
.HasComment("是否 有基准时间(首次给药时间)");
@ -16551,11 +16557,19 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("IRaCIS.Core.Domain.Models.Trial", "Trial")
.WithMany()
.HasForeignKey("TrialId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("CreateUserRole");
b.Navigation("DicomSerie");
b.Navigation("DicomStudy");
b.Navigation("Trial");
});
modelBuilder.Entity("IRaCIS.Core.Domain.Models.DicomSeries", b =>