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

2023-01-17 09:36:12 +08:00
parent 8825a841fa 695d8af721
commit 88975db473
4 changed files with 191 additions and 104 deletions
@@ -112,7 +112,6 @@ namespace IRaCIS.Application.Services
            else
            {
                var entity = (await _readingClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException();
-                _mapper.Map(indto, entity);
                await _readingClinicalDataPDFRepository.BatchDeleteNoTrackingAsync(x => indto.DeleteFileIds.Contains(x.Id));

                var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF()
@@ -123,6 +122,19 @@ namespace IRaCIS.Application.Services

                    ReadingClinicalDataId = entity.Id,
                }).ToList();
+
+                
+
+                _mapper.Map(indto, entity);
+
+                //上传  或者删除了文件 核查状态需要重新确认
+
+                if (indto.AddFileList.Count > 0 || indto.AddFileList.Count > 0)
+                {
+                    entity.IsComplete = null;
+                    entity.IsBlind = null;
+                }
+
                await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList);

                await _readingClinicalDataPDFRepository.SaveChangesAsync();
@@ -266,7 +278,7 @@ namespace IRaCIS.Application.Services

            var data = await _readingClinicalDataRepository.FirstOrDefaultAsync(t => t.Id == inDto.ReadingClinicalDataId);

-            if (data.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveChecked)
+            if (data.ReadingClinicalDataState != ReadingClinicalDataStatus.HaveChecked)
            {
                 throw new BusinessValidationFailedException("当前临床数据状态不是已核查状态，不允许签名！");
            }
@@ -381,6 +393,8 @@ namespace IRaCIS.Application.Services
                IsFrontTaskNeedSignButNotSign = true
            });

+
+
            var visitTaskIdQueryable2= _visitTaskRepository.Where(visitTaskLambda) //该Subject  该标准的任务
                                                                                   //小于自己任务号的任务  存在需要签名  但是没签名
                      .Where(t =>! t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum && t.IsFrontTaskNeedSignButNotSign == true))
@@ -728,6 +742,7 @@ namespace IRaCIS.Application.Services
            var fileCount = await _readingClinicalDataPDFRepository.Where(t => t.ReadingClinicalDataId == pdf.ReadingClinicalDataId).CountAsync();

            await _readingClinicalDataRepository.UpdatePartialFromQueryAsync(pdf.ReadingClinicalDataId, c => new ReadingClinicalData() { FileCount = fileCount }, true);
+
            return ResponseOutput.Result(true);
        }