稽查修改

2022-08-18 14:08:13 +08:00
parent fe3316f7a8
commit 81a0a7d02d
10 changed files with 137 additions and 44 deletions
@@ -382,6 +382,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool? IsComplete { get; set; }

+
+		//临床数据状态
+		public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
+
 		/// <summary>
 		/// 文件数量
 		/// </summary>
@@ -96,6 +96,8 @@ namespace IRaCIS.Application.Services
                    ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel,
                    ReadingId = indto.ReadingId
                }).ToList();
+
+                entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
                await _readingClinicalDataRepository.AddAsync(entity, true);
                var success = await _readingClinicalDataRepository.SaveChangesAsync();
                return ResponseOutput.Ok(entity.Id);
@@ -118,6 +120,7 @@ namespace IRaCIS.Application.Services
                    ReadingId = indto.ReadingId,
                    ReadingClinicalDataId = entity.Id,
                }).ToList();
+                entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
                await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList);
                var success = await _readingClinicalDataRepository.SaveChangesAsync();
                return ResponseOutput.Ok(entity.Id);
@@ -229,6 +232,7 @@ namespace IRaCIS.Application.Services
        {

            await _readingClinicalDataRepository.DeleteFromQueryAsync(x => x.Id == id, true);
+            await _readingClinicalDataPDFRepository.DeleteFromQueryAsync(x => x.ReadingClinicalDataId == id, true);
            return ResponseOutput.Result(true);
        }

@@ -295,7 +299,8 @@ namespace IRaCIS.Application.Services
        {
            await _readingClinicalDataRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.ReadingClinicalDataId, x => new ReadingClinicalData()
            {
-                IsSign = true
+                IsSign = true,
+                ReadingClinicalDataState=ReadingClinicalDataStatus.HaveSigned
            });

            var result = await _readingClinicalDataRepository.SaveChangesAsync();
@@ -448,10 +453,11 @@ namespace IRaCIS.Application.Services
        [HttpPut]
        public async Task<IResponseOutput> PMClinicalDataConfirm(PMClinicalDataConfirmCommand command)
        {
-            await _readingClinicalDataRepository.BatchUpdateNoTrackingAsync(t => t.Id == command.Id, u => new ReadingClinicalData()
+            await _readingClinicalDataRepository.UpdatePartialFromQueryAsync(t => t.Id == command.Id, u => new ReadingClinicalData()
            {
                IsBlind=command.IsBlind,
-                IsComplete=command.IsComplete
+                IsComplete=command.IsComplete,
+                ReadingClinicalDataState=ReadingClinicalDataStatus.HaveChecked
            });
            await _readingClinicalDataRepository.SaveChangesAsync();

@@ -480,6 +486,9 @@ namespace IRaCIS.Application.Services
                  IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
                  IsBlind=x.IsBlind,
                  IsComplete=x.IsComplete,
+
+                  ReadingClinicalDataState=x.ReadingClinicalDataState,
+
                  FileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
                  {
                      Id = y.Id,