From 0266072c6afbfee3c8d05a77a1e3fac40f42b43e Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 26 Dec 2025 10:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingImageTaskViewModel.cs | 31 +++++++++++++++++++ .../Reading/Dto/ReadingMedicalReviewDto.cs | 14 +++++++++ .../ReadingMedicalReviewService.cs | 4 +++ .../ReadingGlobalTaskService.cs | 9 +++--- .../ReadingJudgeTaskService.cs | 7 +++++ .../ReadingOncologyTaskService.cs | 5 +++ 6 files changed, 66 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index ad491005c..e4e6f8eb1 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1524,6 +1524,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Answer { get; set; } + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + + + /// + /// 自定义单位 + /// + public string? CustomUnit { get; set; } + + public ValueUnit? Unit { get; set; } + /// /// 问题类型 @@ -1865,6 +1878,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueOfType? ValueType { get; set; } + + /// + /// 自定义单位 + /// + public string? CustomUnit { get; set; } + + /// /// 类型 /// @@ -2315,6 +2335,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public ValueUnit? Unit { get; set; } + + /// + /// 自定义单位 + /// + public string? CustomUnit { get; set; } + + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question; } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs index b50c85548..ef361d1ea 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs @@ -633,6 +633,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string TypeValue { get; set; } + /// /// 是否启用 /// @@ -758,6 +759,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Answer { get; set; } + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + + + /// + /// 自定义单位 + /// + public string? CustomUnit { get; set; } + + public ValueUnit? Unit { get; set; } + /// /// 排序 /// diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index e89573372..942adf5f9 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -250,6 +250,9 @@ namespace IRaCIS.Core.Application.Service var visitTaskAnswer = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId) && x.ReadingQuestionTrial.IsJudgeQuestion).Select(x => new JudgeQuestionAnswerInfo { Answer = x.Answer, + Unit=x.ReadingQuestionTrial.Unit, + ValueType=x.ReadingQuestionTrial.ValueType, + CustomUnit=x.ReadingQuestionTrial.CustomUnit, VisitTaskId = x.VisitTaskId, DictionaryCode = x.ReadingQuestionTrial.DictionaryCode, ShowOrder = x.ReadingQuestionTrial.ShowOrder, @@ -338,6 +341,7 @@ namespace IRaCIS.Core.Application.Service ShowOrder = data.ShowOrder, ParentId = data.ParentId, TypeValue = data.TypeValue, + Answer = leftquestionAnswer.Answer }; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index aa1e0d22c..5eb38de5f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -269,7 +269,8 @@ namespace IRaCIS.Core.Application.Service ShowOrder = y.ReadingQuestionTrial.ShowOrder, Type = y.ReadingQuestionTrial.Type, TypeValue = y.ReadingQuestionTrial.TypeValue, - ValueType = y.ReadingQuestionTrial.ValueType, + CustomUnit = y.ReadingQuestionTrial.CustomUnit, + Unit = y.ReadingQuestionTrial.Unit, IsJudgeQuestion = y.ReadingQuestionTrial.IsJudgeQuestion, Answer = y.Answer, }).ToList() @@ -313,7 +314,7 @@ namespace IRaCIS.Core.Application.Service ValueType = y.ValueType, IsJudgeQuestion = y.IsJudgeQuestion, Answer = string.Empty, - + CustomUnit = y.CustomUnit, }); } @@ -399,7 +400,7 @@ namespace IRaCIS.Core.Application.Service JudgeType = lr.question.JudgeType, TypeValue = lr.question.TypeValue, ValueType = lr.question.ValueType, - + CustomUnit = lr.question.CustomUnit, }).ToList(); @@ -524,7 +525,7 @@ namespace IRaCIS.Core.Application.Service ShowOrder = x.Dictionary.ShowOrder, ParentCode = x.Dictionary.Parent.Code, Value = x.Dictionary.Value, - ValueCN = x.Dictionary.ValueCN + ValueCN = x.Dictionary.ValueCN, }).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync(); result.AssessTypeList = assessTypeList; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index f1234aeba..8a43614ff 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -265,6 +265,9 @@ namespace IRaCIS.Core.Application.Service Answer = x.Answer, Type = x.ReadingQuestionTrial.Type, Unit = x.ReadingQuestionTrial.Unit, + CustomUnit= x.ReadingQuestionTrial.CustomUnit, + ValueType=x.ReadingQuestionTrial.ValueType, + QuestionId = x.ReadingQuestionTrial.Id, QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, @@ -314,10 +317,13 @@ namespace IRaCIS.Core.Application.Service Answer = x.Answer, Type = x.Type, Unit = x.Unit, + CustomUnit=x.CustomUnit, + QuestionId = x.QuestionId!.Value, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, DictionaryCode = x.DictionaryCode, + ValueType=x.ValueType, }).ToList() }; @@ -358,6 +364,7 @@ namespace IRaCIS.Core.Application.Service QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, DictionaryCode = x.DictionaryCode, + ValueType=x.ValueType, }).ToList() }; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs index 24955193a..e1ba07115 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs @@ -202,6 +202,8 @@ namespace IRaCIS.Core.Application.Service TypeValue = y.ReadingQuestionTrial.TypeValue, ValueType = y.ReadingQuestionTrial.ValueType, IsJudgeQuestion = y.ReadingQuestionTrial.IsJudgeQuestion, + Unit = y.ReadingQuestionTrial.Unit, + CustomUnit = y.ReadingQuestionTrial.CustomUnit, Answer = y.Answer, }).ToList() }).ToListAsync(); @@ -285,6 +287,9 @@ namespace IRaCIS.Core.Application.Service QuestionName = y.QuestionName, QuestionGenre = y.QuestionGenre, DictionaryCode = y.DictionaryCode, + Unit=y.Unit, + CustomUnit=y.CustomUnit, + ValueType = y.ValueType, Answer = y.Answer }).ToList(); x.IsHaveChange = result.ReadingCategory == ReadingCategory.Visit ? false : globalVisits.Where(y => x.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Any(y => y.IsHaveChange);