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

2023-03-27 16:39:12 +08:00
parent 1dae1834a4 a123d6c255
commit dfecd1cb3b
7 changed files with 77 additions and 25 deletions
@@ -1141,6 +1141,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto

        public Arm ArmEnum { get; set; }

+
+        /// <summary>
+        /// 是否是转变的任务(转为IRECIST)
+        /// </summary>
+        public bool IsConvertedTask { get; set; } = false;
+
+        public bool IsFirstChangeTask { get; set; } = false;
+
        public string AgreeOrNotAnswer
        {
            get 
@@ -224,9 +224,11 @@ namespace IRaCIS.Application.Services
                    VisitName = x.TaskName,
                    BlindName = x.TaskBlindName,
                    VisitTaskId = x.Id,
+                    IsConvertedTask = x.IsConvertedTask,
+                    IsFirstChangeTask = x.IsConvertedTask && x.BeforeConvertedTaskId != null,
                    ArmEnum = taskInfo.ArmEnum,
                    VisitNum = x.SourceSubjectVisit.VisitNum,
-                    IsBaseLine=x.SourceSubjectVisit.IsBaseLine,
+                    IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
                    VisitId = x.SourceSubjectVisitId.Value,
                    CrterionDictionaryGroup=  x.CrterionDictionaryGroup,
                    BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
@@ -1377,7 +1377,10 @@ namespace IRaCIS.Application.Services
        {
            await VerifyTaskIsSign(inDto.VisitTaskId);

-            var deleteRowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.RowId).FirstNotNullAsync();
+
+
+            var deleteRowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.RowId).FirstOrDefaultAsync();
+
            if (deleteRowInfo == null)
            {
                return ResponseOutput.Ok(true);