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

修改

Uat_IRC_Net8
he 2025-01-09 17:12:03 +08:00
parent 81cb833d57
commit 5111372972
11 changed files with 18595 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -2222,6 +2222,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
foreach (var item in readingTaskQuestionMarkList)
{
item.Id = Guid.Empty;
item.FristAddTaskId = item.VisitTaskId == item.FristAddTaskId ? newTask.Id : item.FristAddTaskId;
item.VisitTaskId = newTask.Id;
}

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -481,7 +481,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public int? NumberOfFrames { get; set; }
public string MeasureData { get; set; } = string.Empty;
public Guid? FirstAddTaskId { get; set; }
public Guid? FristAddTaskId { get; set; }
public QuestionType? QuestionType { get; set; }
public string OrderMarkName { get; set; } = string.Empty;
@ -1251,7 +1251,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string? MeasureData { get; set; }
public Guid? FirstAddTaskId { get; set; }
public Guid? FristAddTaskId { get; set; }
public QuestionType? QuestionType { get; set; }

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

@ -138,8 +138,8 @@ namespace IRaCIS.Core.Application.Service
public async Task<SaveTableQuestionMarkInDto> SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto, string param)
{
inDto.FirstAddTaskId = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == inDto.TableQuestionId && x.RowId == inDto.RowId).Select(x => x.FirstAddTaskId).FirstOrDefaultAsync();
inDto.FirstAddTaskId = inDto.FirstAddTaskId == null ? inDto.VisitTaskId : inDto.FirstAddTaskId;
inDto.FristAddTaskId = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == inDto.TableQuestionId && x.RowId == inDto.RowId).Select(x => x.FristAddTaskId).FirstOrDefaultAsync();
inDto.FristAddTaskId = inDto.FristAddTaskId == null ? inDto.VisitTaskId : inDto.FristAddTaskId;
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.RowId == inDto.RowId.Value && x.TableQuestionId == inDto.TableQuestionId);
await _readingTableQuestionAnswerRepository.AddAsync(new ReadingTableQuestionAnswer()
@ -1933,7 +1933,7 @@ namespace IRaCIS.Core.Application.Service
var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).Select(x => new
{
x.QuestionId,
x.FirstAddTaskId,
x.FristAddTaskId,
}).ToListAsync();
@ -1969,7 +1969,7 @@ namespace IRaCIS.Core.Application.Service
x.Id = NewId.NextGuid();
x.VisitTaskId = inDto.VisitTaskId;
x.CreateTime = datetime;
x.FirstAddTaskId = questionMarkList.Where(y => y.QuestionId == x.QuestionId).Select(x => x.FirstAddTaskId).FirstOrDefault() ?? inDto.VisitTaskId;
x.FristAddTaskId = questionMarkList.Where(y => y.QuestionId == x.QuestionId).Select(x => x.FristAddTaskId).FirstOrDefault() ?? inDto.VisitTaskId;
});
await _readingTaskQuestionMarkRepository.AddRangeAsync(markList);
}

2
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -118,7 +118,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.ValueCN, u => u.MapFrom(s => s.Dictionary.ValueCN));
CreateMap<ReadingTaskQuestionMark, GetTableAnswerRowInfoOutDto>()
.ForMember(d => d.FristAddTaskId, u => u.MapFrom(s => s.FirstAddTaskId!.Value));
.ForMember(d => d.FristAddTaskId, u => u.MapFrom(s => s.FristAddTaskId!.Value));
CreateMap<ReadingTaskQuestionMark, QuestionMarkInfo>();
CreateMap<QuestionMarkInfo, ReadingTaskQuestionMark>();
//CreateMap<ReadingClinicalDataView, GetReadingClinicalDataListOutDto>();

2
IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
View File

@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid QuestionId { get; set; }
public Guid? FirstAddTaskId { get; set; }
public Guid? FristAddTaskId { get; set; }
public QuestionType? QuestionType { get; set; }
public string OrderMarkName { get; set; } = string.Empty;

2
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -1413,7 +1413,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == LastVisitTaskId).Select(x => new ReadingTaskQuestionMark()
{
VisitTaskId = visitTaskId,
FirstAddTaskId = x.FirstAddTaskId,
FristAddTaskId = x.FristAddTaskId,
QuestionId = x.QuestionId,
QuestionType = x.QuestionType,
OrderMarkName = x.OrderMarkName,

2
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
View File

@ -1412,7 +1412,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == LastVisitTaskId).Select(x => new ReadingTaskQuestionMark()
{
VisitTaskId = visitTaskId,
FirstAddTaskId = x.FirstAddTaskId,
FristAddTaskId = x.FristAddTaskId,
QuestionId = x.QuestionId,
QuestionType = x.QuestionType,
OrderMarkName = x.OrderMarkName,

2
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs
View File

@ -33,7 +33,7 @@ public class ReadingTaskQuestionMark : BaseAddAuditEntity
[MaxLength]
public string MeasureData { get; set; } = string.Empty;
public Guid? FirstAddTaskId { get; set; }
public Guid? FristAddTaskId { get; set; }
public QuestionType? QuestionType { get; set; }
public string OrderMarkName { get; set; } = string.Empty;

18554
IRaCIS.Core.Infra.EFCore/Migrations/20250109091126_markinfo02.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

28
IRaCIS.Core.Infra.EFCore/Migrations/20250109091126_markinfo02.cs Normal file
View File

@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class markinfo02 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "FirstAddTaskId",
table: "ReadingTaskQuestionMark",
newName: "FristAddTaskId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "FristAddTaskId",
table: "ReadingTaskQuestionMark",
newName: "FirstAddTaskId");
}
}
}

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

@ -7038,7 +7038,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FirstAddTaskId")
b.Property<Guid?>("FristAddTaskId")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("InstanceId")