Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

2023-04-06 16:39:29 +08:00
parent 6e7d288832 3ae1d6d726
commit 82d06c7426
5 changed files with 21 additions and 5 deletions
@@ -569,6 +569,8 @@ namespace IRaCIS.Application.Services
        /// <exception cref="BusinessValidationFailedException"></exception>
        private async Task VerifyTaskIsSign(Guid visitTaskid)
        {
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskid).FirstNotNullAsync();
+
            if (await _visitTaskRepository.AnyAsync(x => x.Id == visitTaskid && x.ReadingTaskState == ReadingTaskState.HaveSigned))
            {
                throw new BusinessValidationFailedException(_localizer["ReadingImage_BeSigned"]);
@@ -579,6 +581,17 @@ namespace IRaCIS.Application.Services
            {
                throw new BusinessValidationFailedException(_localizer["ReadingImage_Beinvalid"]);
            }
+
+            if (await _visitTaskRepository.AnyAsync(x => x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
+            &&x.IsAnalysisCreate&&taskInfo.IsAnalysisCreate
+            &&x.SubjectId== taskInfo.SubjectId&&x.TaskState==TaskState.Effect&&
+            ((x.ReReadingApplyState==ReReadingApplyState.DocotorHaveApplyed && x.DoctorUserId == taskInfo.DoctorUserId)|| x.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
+
+            ))
+            {
+                throw new BusinessValidationFailedException(_localizer["ReadingImage_PresenceReview"]);
+            }
+
        }


@@ -2063,7 +2076,7 @@ namespace IRaCIS.Application.Services

            var isConvertedTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x=>x.IsConvertedTask).FirstNotNullAsync();

-            if (await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.ReadingQuestionTrial.LesionType == LesionType.NewLesions && x.VisitTaskId == inDto.VisitTaskId))
+            if (isConvertedTask&&(await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.ReadingQuestionTrial.LesionType == LesionType.NewLesions && x.VisitTaskId == inDto.VisitTaskId)))
            {
                throw new BusinessValidationFailedException(_localizer["ReadingImage_NotNewFocus"]);
            }
@@ -1574,7 +1574,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
        #endregion


-
+        /// <summary>
+        /// 获取新靶病灶评估
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
        public async Task<string> GetNewTargetLesionEvaluate(ReadingCalculateDto inDto)
        {
            var tableQuestion = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewTargetLesion).SelectMany(x => x.TableRowInfoList).ToList();