修改

2022-11-04 15:41:35 +08:00
parent 40baccf48b
commit 1d82214520
7 changed files with 119 additions and 39 deletions
@@ -149,6 +149,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// </summary>
        public bool IsOnlyChangeAllTask { get; set; } = false;

+        /// <summary>
+        /// 修约小数点
+        /// </summary>
+        public int DigitPlaces { get; set; } = 2;
+
        public List<QuestionInfo> QuestionInfo { get; set; } = new List<QuestionInfo>();


@@ -842,7 +842,8 @@ namespace IRaCIS.Application.Services
        {
            SubmitTableQuestionOutDto result = new SubmitTableQuestionOutDto();
            await VerifyTaskIsSign(inDto.VisitTaskId);
-
+            var criterionId = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.TrialReadingCriterionId).FirstOrDefaultAsync();
+            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == criterionId).FirstNotNullAsync();
            var tableQuestionIds = inDto.AnswerList.Select(x => x.TableQuestionId).ToList();

            var tableQuestionIdGroup = tableQuestionIds.GroupBy(x => new { TableQuestionId = x }).Select(x => new TableQuestionData
@@ -883,8 +884,23 @@ namespace IRaCIS.Application.Services

                        if (rowCount > item.MaxRowCount.Value - 1)
                        {
-                            //throw new BusinessValidationFailedException($"问题{item.QuestionName}最大相同问题数为{item.MaxRowCount.Value},当前已存在{rowCount}条！");
-                            throw new BusinessValidationFailedException($"按照RECIST1.1的相关规则，同一器官的靶病灶数量不超过{item.MaxRowCount.Value}个，请确认！！");
+                           
+                            Dictionary<CriterionType, string> errorMsgDic = new Dictionary<CriterionType, string>()
+                            {
+                               {CriterionType.RECIST1Pointt1, "按照RECIST1.1的相关规则，同一器官的靶病灶数量不超过"},
+                            };
+                            string msg = string.Empty;
+                            try
+                            {
+                                msg = $"{ errorMsgDic[criterionInfo.CriterionType]}{item.MaxRowCount.Value}个，请确认！！";
+                            }
+                            catch (Exception)
+                            {
+
+                                msg=$"问题{item.QuestionName}最大相同问题数为{item.MaxRowCount.Value},当前已存在{rowCount}条！";
+                            }
+
+                            throw new BusinessValidationFailedException(msg);
                        }
                    }
                }