代码提交

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -161,7 +161,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<CopyTableAnswerRowInfo, ReadingTableAnswerRowInfo>().ForMember(dest => dest.CreateUserRole, opt => opt.Ignore());
 
             CreateMap<ReadingTableAnswerRowInfo, CopyTableAnswerRowInfo>()
-                .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));
+                  .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id))
+                  .ForMember(d => d.LesionType, u => u.MapFrom(s => s.ReadingQuestionTrial.LesionType));
 
             //.ForMember(dest => dest.Instance, opt => opt.Ignore())
             //.ForMember(dest => dest.ReadingQuestionTrial, opt => opt.Ignore());

IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs

@@ -823,8 +823,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 x.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Point1 &&
                 x.SubjectId == taskinfo.SubjectId &&
                 x.SourceSubjectVisitId == taskinfo.SourceSubjectVisitId 
-                //&&
-                //x.DoctorUserId==taskinfo.DoctorUserId
                 ).FirstOrDefaultAsync();
                 if (recistTask != null)
                 {
@@ -886,6 +884,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     {
                       
                         item.QuestionId = tableRowAnswers.Where(y => y.OriginalId == item.RowId).Select(x => x.QuestionId).FirstOrDefault();
+
                         item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault();
                     }
 

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -3217,6 +3217,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     UserRealName = userRealName,
 
                 };
+
+                var extraIdentification = string.Empty;
+                var isDistinctionInterface = true;
                 #region 标识区分
 
                 if (type == AuditOpt.Add)
@@ -3263,11 +3266,30 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                                 type = type + "/" + 2;
                             }
 
+                            break;
+
+                        case "ReadingImageTask/resetReadingTask":
+                            //跳转阅片结果需要该参数
+
+                            obj.IsReadingReset = true;
+
                             break;
                     }
 
                 }
 
+                if (obj.IsReadingReset != true)
+                {
+                    if (entity.ReadingTaskState == ReadingTaskState.Reading)
+                    {
+                        if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.ReadingTaskState == ReadingTaskState.WaitReading))
+                        {
+                            isDistinctionInterface = false;
+                            extraIdentification = "/ChangeToReading";
+                        }
+                    }
+                }
+
                 //访视任务-- 非Dicom 阅片
                 if (_userInfo.RequestUrl == "ReadingImageTask/SubmitVisitTaskQuestions" && entity.ReadingTaskState != ReadingTaskState.HaveSigned && type == AuditOpt.Update)
                 {
@@ -3401,8 +3423,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 {
                     VisitTaskId = x.Id,
                     SubjectVisitId= subjectVisitId,
-
-                    IsDistinctionInterface = type == AuditOpt.Update ? true : false,
+                    ExtraIndentification = extraIdentification,
+   
+                    IsDistinctionInterface = type == AuditOpt.Update && isDistinctionInterface ? true : false,
 
                     ObjectRelationParentId = entity.SourceSubjectVisitId != null ? entity.SourceSubjectVisitId : entity.SouceReadModuleId,
 

IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs

@@ -62,6 +62,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
         public string CutOffVisitName { get; set; }
 
         public string SelectResult { get; set; }
+
+        public bool? IsReadingReset { get; set; }
     }
     public class InspectionConvertDTO : DataInspection
     {