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

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -275,6 +275,16 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
 
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
+
+        /// <summary>
+        /// 是否盲化
+        /// </summary>
+        public bool? IsBlind { get; set; }
+
+        /// <summary>
+        /// 是否完整
+        /// </summary>
+        public bool? IsComplete { get; set; }
     }
 
     /// <summary>

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -285,6 +285,8 @@ namespace IRaCIS.Application.Services
                 //---当前临床数据状态不是已核查状态，不允许签名！
                 throw new BusinessValidationFailedException(_localizer["ReadingClinicalData_Unchecked"]);
             }
+            data.IsBlind = inDto.IsBlind;
+            data.IsComplete=inDto.IsComplete;
             data.IsSign = true;
             data.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned;
 
@@ -414,7 +416,8 @@ namespace IRaCIS.Application.Services
 
 
 
-
+        // 废弃 接口合并到签名哪里
+       
         [HttpPut]
         public async Task<IResponseOutput> PMClinicalDataConfirm(PMClinicalDataConfirmCommand command)
         {
@@ -424,9 +427,12 @@ namespace IRaCIS.Application.Services
                 IsComplete = command.IsComplete,
                 ReadingClinicalDataState = ReadingClinicalDataStatus.HaveChecked
             });
+
             await _readingClinicalDataRepository.SaveChangesAsync();
 
             return ResponseOutput.Ok();
+
+
         }
         #endregion