修改重置阅片稽查3

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -3271,7 +3271,7 @@ namespace IRaCIS.Core.Application.Service
             await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingCustomTagRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
             {
                 ReadingTaskState = ReadingTaskState.WaitReading
             });

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

@@ -188,7 +188,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     //TrialDicList = string.Join(",", trialDics)
 
                     ImageFormatListStr = string.Join("|", entity.ImageFormatList),
-                    StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x=>_userInfo.IsEn_Us?x.EnName:x.Name )),
+                    StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)),
 
                     CriterionNames = string.Join(",", criterionNameList.Union(memoryCriterionNameList).Distinct()),
 
@@ -3241,7 +3241,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     u.ShowOrder
                 }
                 ).OrderBy(t => t.ShowOrder).ToList()
-                },_userInfo.AuditIdentification);
+                }, _userInfo.AuditIdentification);
 
 
                 ////添加/修改病灶接口  只会对单个病灶进行操作
@@ -3512,7 +3512,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                             //PM 申请重阅，区分不了是否有SPM参与
 
-                            if (entity.ReReadingApplyState== ReReadingApplyState.TrialGroupHaveApplyed)
+                            if (entity.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
                             {
 
                                 //var hasSPM = _dbContext.VisitTaskReReading.Any(t => t.OriginalReReadingTaskId == entity.Id);
@@ -3577,6 +3577,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                             break;
 
+                        case "ReadingImageTask/resetReadingTask":
+                            //跳转阅片结果需要该参数
+
+                            obj.IsReadingReset = true;
+
+                            break;
+
                     }
 
                     #region 裁判、肿瘤学、全局 都是通用的
@@ -3601,18 +3608,24 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                     //增加进入阅片中的稽查
 
+                    //重置阅片也会从待阅片 变为阅片中，因为复制病灶依赖这个改变
+                    if (obj.IsReadingReset != true)
+                    {
                         if (entity.ReadingTaskState == ReadingTaskState.Reading)
                         {
-                        if(_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.ReadingTaskState== ReadingTaskState.WaitReading))
+                            if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.ReadingTaskState == ReadingTaskState.WaitReading))
                             {
                                 isDistinctionInterface = false;
                                 extraIdentification = "/ChangeToReading";
                             }
                         }
+                    }
+
+
 
                     if (entity.IsReadClinicalData == true)
                     {
-                        if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.IsReadClinicalData ==false))
+                        if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.IsReadClinicalData == false))
                         {
                             isDistinctionInterface = false;
                             extraIdentification = "/ReadClinicalData";
@@ -3620,6 +3633,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     }
 
 
+
                 }
 
 
@@ -3738,7 +3752,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
         /// <param name="expression">表达式</param>
         /// <param name="otherItem">其他对象</param>
         /// <returns></returns>
-        public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> expression = null, object otherItem = null,string auditIdentification = "") where T : Entity
+        public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> expression = null, object otherItem = null, string auditIdentification = "") where T : Entity
         {
 
             InspectionConvertDTO inspection = new InspectionConvertDTO();
@@ -3965,7 +3979,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
         /// 获取稽查记录的标识符   部分业务会进行特殊处理
         /// </summary>
         /// <returns></returns>
-        public string GetInspectionRecordIdentification<T>(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false,string auditIdentification="")
+        public string GetInspectionRecordIdentification<T>(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false, string auditIdentification = "")
         {
             //var entityType = _dbContext.Model.FindEntityType(entityObj.GetType());
             //var tableName = entityType.GetTableName();
@@ -3984,11 +3998,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 //自定义 标识后面 补充由代码上层的 extraIdentification 附加
                 if (isSelfDefine)
                 {
-                    result= $"{_userInfo.RequestUrl}/{entityTypeName}";
+                    result = $"{_userInfo.RequestUrl}/{entityTypeName}";
                 }
                 else
                 {
-                    result= $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
+                    result = $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
                 }
 
 

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
     {