XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Test_IRC_Net8
hang 2025-10-27 10:48:35 +08:00
parent 998b92aa79 60ce8c45b2
commit a9c80a670b
8 changed files with 20894 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Document/DTO/UserAgreementViewModel.cs
View File

@ -26,7 +26,9 @@ public class UserAgreementAddOrEdit
public DateTime EffectiveDate { get; set; }
public string FileContent { get; set; }
public string FileEnContent { get; set; }
public string FileName { get; set; }
public string FileVersion { get; set; }

3
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -1120,7 +1120,8 @@ namespace IRaCIS.Core.Application.Service
{
UserAgreementTypeEnum = UserAgreementType.UserAgreement,
FileVersion=userAgreement.FileVersion,
UserAgreementId=userAgreement.Id
UserAgreementId=userAgreement.Id,
IsEn_Us= _userInfo.IsEn_Us,
};

5
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -1350,6 +1350,10 @@ namespace IRaCIS.Core.Application.Service
}
var isHaveBindingQuestion=(await _readingQuestionTrialRepository.AnyAsync(x=>x.ReadingQuestionCriterionTrialId==taskInfo.TrialReadingCriterionId&&x.ImageToolAttribute!=string.Empty))
|| (await _readingTableQuestionTrialRepository.AnyAsync(x=>x.ReadingQuestionTrial.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId && x.ImageToolAttribute != string.Empty));
return (await GetReadingTableQuestion(
new GetReadingTableQuestionOrAnswerInDto()
{
@ -1364,6 +1368,7 @@ namespace IRaCIS.Core.Application.Service
}
), new
{
IsHaveBindingQuestion= isHaveBindingQuestion,
IsBaseline = taskInfo.SourceSubjectVisit != null && taskInfo.SourceSubjectVisit.IsBaseLine,
ReadingTaskState = taskInfo.ReadingTaskState,
QuestionMarkInfoList = tableQuestionMarkList,

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
View File

@ -291,12 +291,14 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput> AddNoneDicomMark(AddNoneDicomMarkInDto inDto)
{
var entity = await _readingNoneDicomMarkRepository.InsertOrUpdateAsync(inDto, true);
var entity = await _readingNoneDicomMarkRepository.InsertOrUpdateAsync(inDto,true);
if (inDto.Proportion != null)
{
await this.ChangePlottingScale(entity.Id, inDto.Proportion.Value);
}
await _visitTaskRepository.SaveChangesAsync();
return ResponseOutput.Ok(entity.Id);
}

6
IRaCIS.Core.Domain/Management/UserAgreement.cs
View File

@ -28,6 +28,12 @@ public class UserAgreement : BaseFullAuditEntity
[MaxLength]
public string FileContent { get; set; } = string.Empty;
/// <summary>
/// 文件内容
/// </summary>
[MaxLength]
public string FileEnContent { get; set; } = string.Empty;
/// <summary>
/// 更新日期
/// </summary>

20816
IRaCIS.Core.Infra.EFCore/Migrations/20251024024237_FileEnContent.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

53
IRaCIS.Core.Infra.EFCore/Migrations/20251024024237_FileEnContent.cs Normal file
View File

@ -0,0 +1,53 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class FileEnContent : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_ReadingNoneDicomMarkBinding_NoneDicomStudy_NoneDicomMarkId",
table: "ReadingNoneDicomMarkBinding");
migrationBuilder.AddColumn<string>(
name: "FileEnContent",
table: "UserAgreement",
type: "nvarchar(max)",
nullable: false,
defaultValue: "");
migrationBuilder.AddForeignKey(
name: "FK_ReadingNoneDicomMarkBinding_ReadingNoneDicomMark_NoneDicomMarkId",
table: "ReadingNoneDicomMarkBinding",
column: "NoneDicomMarkId",
principalTable: "ReadingNoneDicomMark",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_ReadingNoneDicomMarkBinding_ReadingNoneDicomMark_NoneDicomMarkId",
table: "ReadingNoneDicomMarkBinding");
migrationBuilder.DropColumn(
name: "FileEnContent",
table: "UserAgreement");
migrationBuilder.AddForeignKey(
name: "FK_ReadingNoneDicomMarkBinding_NoneDicomStudy_NoneDicomMarkId",
table: "ReadingNoneDicomMarkBinding",
column: "NoneDicomMarkId",
principalTable: "NoneDicomStudy",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}

8
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -14620,6 +14620,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("FileEnContent")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("FileName")
.IsRequired()
.HasMaxLength(400)
@ -17355,7 +17359,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("IRaCIS.Core.Domain.Models.NoneDicomStudy", "NoneDicomStudy")
b.HasOne("IRaCIS.Core.Domain.Models.ReadingNoneDicomMark", "ReadingNoneDicomMark")
.WithMany()
.HasForeignKey("NoneDicomMarkId")
.OnDelete(DeleteBehavior.Cascade)
@ -17363,7 +17367,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Navigation("CreateUserRole");
b.Navigation("NoneDicomStudy");
b.Navigation("ReadingNoneDicomMark");
});
modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingOncologyTaskInfo", b =>