器官维护

IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs

@@ -172,6 +172,23 @@ namespace IRaCIS.Core.Application.ViewModel
         /// 位置 英文
         /// </summary>
         public string TULATEN { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string Classification { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 分类 英文
+        /// </summary>
+        public string ClassificationEN { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        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; }
 
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string Classification { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 分类 英文
+        /// </summary>
+        public string ClassificationEN { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int ShowOrder { get; set; } = 0;
+
 
         /// <summary>
         /// 是否可编辑位置
@@ -358,6 +391,23 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid? Id { get; set; }
         public string Part { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string Classification { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 分类 英文
+        /// </summary>
+        public string ClassificationEN { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int ShowOrder { get; set; } = 0;
+
         public string TULOC { get; set; }
         public string TULAT { get; set; }
 

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; }

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<OrganInfoView>(_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<OrganInfoView>(_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);
         }
 
         /// <summary>
@@ -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();
         }
 
 

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,

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -284,7 +284,7 @@ namespace IRaCIS.Core.Application.Services
         {
             var result = new List<VisitStudyDTO>();
 
-            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();

IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs

@@ -15,11 +15,21 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("OrganInfo")]	
 	 public class OrganInfo : Entity, IAuditAdd
 	 {
-	 
+
-	
+
 		/// <summary>
-        /// 部位
+		/// 分类
-        /// </summary>
+		/// </summary>
+		public string Classification { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 分类 英文
+		/// </summary>
+		public string ClassificationEN { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 部位
+		/// </summary>
 		public string Part { get; set; }
 
 		/// <summary>
@@ -79,6 +89,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool IsCanEditPosition { get; set; }
 
+		/// <summary>
+		/// 序号
+		/// </summary>
+		public int ShowOrder { get; set; } = 0;
+
 		/// <summary>
 		/// 创建人
 		/// </summary>

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; }
 
+		/// <summary>
+		/// 器官Id
+		/// </summary>
+		public Guid? OrganInfoId { get; set; }
+
 
-	
 
 		public bool IsDeleted { get; set; }