From 18eb8b238dbc77ec3f8fee4e56b8142091f4dcc3 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 14 Dec 2022 11:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=AE=98=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/OrganInfoViewModel.cs | 50 +++++++++++++++++++ .../Reading/Dto/ReadingImageTaskViewModel.cs | 2 + .../ReadingCriterion/OrganInfoService.cs | 11 +++- .../ReadingImageTaskService.cs | 3 ++ .../Service/Visit/SubjectVisitService.cs | 2 +- .../Reading/ReadingCriterion/OrganInfo.cs | 23 +++++++-- .../ReadingTableAnswerRowInfo.cs | 6 ++- 7 files changed, 89 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index f62054d6..85de59d3 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -172,6 +172,23 @@ namespace IRaCIS.Core.Application.ViewModel /// 位置 英文 /// public string TULATEN { get; set; } = string.Empty; + + + /// + /// 分类 + /// + public string Classification { get; set; } = string.Empty; + + /// + /// 分类 英文 + /// + public string ClassificationEN { get; set; } = string.Empty; + + + /// + /// 序号 + /// + public int ShowOrder { get; set; } = 0; } public class GetTrialSelectOrganListInDto @@ -286,6 +303,22 @@ namespace IRaCIS.Core.Application.ViewModel public string? TULOC { get; set; } public string? TULAT { get; set; } + /// + /// 分类 + /// + public string Classification { get; set; } = string.Empty; + + /// + /// 分类 英文 + /// + public string ClassificationEN { get; set; } = string.Empty; + + + /// + /// 序号 + /// + public int ShowOrder { get; set; } = 0; + /// /// 是否可编辑位置 @@ -358,6 +391,23 @@ namespace IRaCIS.Core.Application.ViewModel { public Guid? Id { get; set; } public string Part { get; set; } + + /// + /// 分类 + /// + public string Classification { get; set; } = string.Empty; + + /// + /// 分类 英文 + /// + public string ClassificationEN { get; set; } = string.Empty; + + + /// + /// 序号 + /// + public int ShowOrder { get; set; } = 0; + public string TULOC { get; set; } public string TULAT { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 5541ce5a..c70457f9 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1377,6 +1377,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public Guid QuestionId { get; set; } + public Guid? OrganInfoId { get; set; } + public int? NumberOfFrames { get; set; } public decimal RowIndex { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs index a3478c5b..1e6b5636 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs @@ -67,6 +67,7 @@ namespace IRaCIS.Core.Application.Service .Where(x => x.SystemCriterionId == inQuery.SystemCriterionId) .WhereIf(inQuery.LesionType != null, x => organs.Contains(x.OrganType)) .WhereIf(inQuery.OrganType != null, x => x.OrganType == inQuery.OrganType) + .OrderBy(x=>x.ShowOrder) .ProjectTo(_mapper.ConfigurationProvider); return await organInfoQueryable.ToListAsync(); } @@ -95,7 +96,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.LesionType != null, x => organs.Contains(x.OrganType)) .WhereIf(inQuery.OrganType != null, x => x.OrganType == inQuery.OrganType) .ProjectTo(_mapper.ConfigurationProvider); - return await organInfoQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(OrganInfoView.OrganType) : inQuery.SortField, inQuery.Asc); + return await organInfoQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(OrganInfoView.ShowOrder) : inQuery.SortField, inQuery.Asc); } /// @@ -147,6 +148,9 @@ namespace IRaCIS.Core.Application.Service Id = trialData.Id, Part = data.Part, TULAT = data.TULAT, + ShowOrder=data.ShowOrder, + Classification=data.Classification, + ClassificationEN=data.ClassificationEN, TULOC = data.TULOC, Remark = data.Remark, IsLymphNodes = data.IsLymphNodes, @@ -216,6 +220,9 @@ namespace IRaCIS.Core.Application.Service TULAT = data.TULAT, TULOC = data.TULOC, Remark = data.Remark, + ShowOrder=data.ShowOrder, + Classification=data.Classification, + ClassificationEN=data.ClassificationEN, IsLymphNodes = data.IsLymphNodes, IsCanEditPosition = data.IsCanEditPosition, IsEnable = trialData.IsEnable, @@ -226,7 +233,7 @@ namespace IRaCIS.Core.Application.Service }; - return await organInfoQueryable.ToListAsync(); + return await organInfoQueryable.OrderBy(x=>x.ShowOrder).ToListAsync(); } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 7775fab0..70dd590d 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -721,6 +721,7 @@ namespace IRaCIS.Application.Services answers.Add("RowIndex", x.ToString()); answers.Add("RowId", rowInfo.Id.ToString()); answers.Add("StudyId", rowInfo.StudyId.ToString()); + answers.Add("OrganInfoId", rowInfo.OrganInfoId.ToString()); answers.Add("IsCanEditPosition", rowInfo.IsCanEditPosition.ToString()); answers.Add("InstanceId", rowInfo == null ? string.Empty : rowInfo.InstanceId.ToString()); answers.Add("SeriesId", rowInfo == null ? string.Empty : rowInfo.SeriesId.ToString()); @@ -1152,6 +1153,7 @@ namespace IRaCIS.Application.Services rowInfo.FristAddTaskNum = inDto.FristAddTaskNum; rowInfo.PicturePath = inDto.PicturePath; rowInfo.RowIndex = inDto.RowIndex; + rowInfo.OrganInfoId = inDto.OrganInfoId; rowInfo.InstanceId = inDto.InstanceId; rowInfo.SeriesId = inDto.SeriesId; rowInfo.VisitTaskId = inDto.VisitTaskId; @@ -1190,6 +1192,7 @@ namespace IRaCIS.Application.Services IsDicomReading = rowInfo.IsDicomReading, IsCurrentTaskAdd = isCurrentTaskAdd, FristAddTaskNum = rowInfo.FristAddTaskNum, + OrganInfoId=rowInfo.OrganInfoId, PicturePath = rowInfo.PicturePath, NumberOfFrames=rowInfo.NumberOfFrames, RowIndex = rowInfo.RowIndex, diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 106c1ec7..d8f07614 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -284,7 +284,7 @@ namespace IRaCIS.Core.Application.Services { var result = new List(); - var thisRowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).ToListAsync(); + var thisRowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x=>x.ReadingQuestionTrial.ShowOrder).ThenBy(x=>x.RowIndex).ToListAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync(); diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs index 1bda2e28..625f7fae 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs @@ -15,11 +15,21 @@ namespace IRaCIS.Core.Domain.Models [Table("OrganInfo")] public class OrganInfo : Entity, IAuditAdd { - - + + /// - /// 部位 - /// + /// 分类 + /// + public string Classification { get; set; } = string.Empty; + + /// + /// 分类 英文 + /// + public string ClassificationEN { get; set; } = string.Empty; + + /// + /// 部位 + /// public string Part { get; set; } /// @@ -79,6 +89,11 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsCanEditPosition { get; set; } + /// + /// 序号 + /// + public int ShowOrder { get; set; } = 0; + /// /// 创建人 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 135a2fc4..33cda719 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -122,8 +122,12 @@ namespace IRaCIS.Core.Domain.Models //string UpdateUserName { get; set; } public DateTime UpdateTime { get; set; } + /// + /// 器官Id + /// + public Guid? OrganInfoId { get; set; } + - public bool IsDeleted { get; set; }