修改监控

IRaCIS.Core.Application/Service/QC/DTO/QCQuestionConfigureViewModel.cs

@@ -36,6 +36,8 @@ namespace IRaCIS.Core.Application.Contracts
         ///<summary> TypeValue</summary>
         public string Type { get; set; } = String.Empty;
 
+        public bool? IsEnable { get; set; }
+
     }
 
     ///<summary> QCQuestionAddOrEdit  列表查询参数模型</summary>

IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs

@@ -119,17 +119,17 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
         [TypeFilter(typeof(TrialResourceFilter))]
-        [HttpDelete("{noneDicomStudyId:guid}/{trialId:guid}")]
+        [HttpDelete("{trialId:guid}/{noneDicomStudyId:guid}")]
         public async Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId)
         {
 
-            var noneDicomStudy = (await _noneDicomStudyRepository.FirstOrDefaultAsync(t => t.Id == noneDicomStudyId)).IfNullThrowException();
 
-            await _noneDicomStudyRepository.DeleteAsync(noneDicomStudy);
+            await _noneDicomStudyRepository.DeleteFromQueryAsync( noneDicomStudyId);
 
             await _noneDicomStudyFileRepository.BatchDeleteNoTrackingAsync(t => t.NoneDicomStudyId == noneDicomStudyId);
 
-            await _studyMonitorRepository.BatchDeleteNoTrackingAsync(t => t.StudyId == noneDicomStudyId);
+            //确认需求 不删除
+            //await _studyMonitorRepository.BatchDeleteNoTrackingAsync(t => t.StudyId == noneDicomStudyId);
 
             await _noneDicomStudyRepository.SaveChangesAsync();
 
@@ -137,14 +137,13 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
 
-        [HttpDelete("{noneDicomStudyFileId:guid}")]
+        [HttpDelete("{trialId:guid}/{noneDicomStudyFileId:guid}")]
         public async Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId)
         {
-            var subjectVisitId = await _noneDicomStudyFileRepository.Where(t => t.Id == noneDicomStudyFileId).Select(t => t.NoneDicomStudy.SubjectVisitId).FirstOrDefaultAsync();
+            //var subjectVisitId = await _noneDicomStudyFileRepository.Where(t => t.Id == noneDicomStudyFileId).Select(t => t.NoneDicomStudy.SubjectVisitId).FirstOrDefaultAsync();
 
             var success = await _noneDicomStudyFileRepository.BatchDeleteNoTrackingAsync(t => t.Id == noneDicomStudyFileId);
 
-
             return ResponseOutput.Ok();
         }
 
@@ -231,6 +230,8 @@ namespace IRaCIS.Core.Application.Contracts
             // 上传非Dicom 后  将状态改为待提交 分为普通上传 和QC后重传  普通上传时才改为待提交
             await _repository.BatchUpdateAsync<SubjectVisit>(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.None, u => new SubjectVisit() { SubmitState = SubmitStateEnum.ToSubmit });
 
+            var studyCode= await  _noneDicomStudyRepository.Where(t=>t.Id== noneDicomStudyId).Select(t => t.StudyCode).FirstOrDefaultAsync();
+
             await _studyMonitorRepository.AddAsync(new StudyMonitor()
             {
                 FileCount = formCollection.Files.Count,
@@ -238,7 +239,7 @@ namespace IRaCIS.Core.Application.Contracts
                 IsDicom = false,
                 IsDicomReUpload = false,
                 StudyId = noneDicomStudyId,
-
+                StudyCode= studyCode,
                 UploadStartTime = startTime,
                 UploadFinishedTime = DateTime.Now,
                 IP = _userInfo.IP,

IRaCIS.Core.Application/Service/QC/QCQuestionService.cs

@@ -30,6 +30,7 @@ namespace IRaCIS.Core.Application.Contracts
             var QCQuestionQueryable = _qcQuestionRepository
                 .WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryQCQuestionConfigure.QuestionName))
                 .WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.Type), t => t.Type.Contains(queryQCQuestionConfigure.Type))
+                 .WhereIf(queryQCQuestionConfigure.IsEnable!=null, t => t.IsEnable==queryQCQuestionConfigure.IsEnable)
              .ProjectTo<QCQuestionConfigureView>(_mapper.ConfigurationProvider);
 
             return await QCQuestionQueryable.ToListAsync();