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

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

@@ -7,6 +7,7 @@ using IRaCIS.Core.Application.Service.Inspection.DTO;
 using Panda.DynamicWebApi.Attributes;
 using Microsoft.Extensions.DependencyInjection;
 using System.Linq.Expressions;
+using IRaCIS.Core.Infrastructure;
 
 namespace IRaCIS.Application.Services
 {
@@ -261,8 +262,14 @@ namespace IRaCIS.Application.Services
 
         public async Task<IResponseOutput> ReadClinicalDataSign(ReadingClinicalDataSignIndto inDto)
         {
+           
+
             var data = await _readingClinicalDataRepository.FirstOrDefaultAsync(t => t.Id == inDto.ReadingClinicalDataId);
 
+            if (data.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveChecked)
+            {
+                 throw new BusinessValidationFailedException("当前临床数据状态不是已核查状态，不允许签名！");
+            }
             data.IsSign = true;
             data.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned;
 

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

@@ -414,7 +414,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                     ObjectRelationParentId = entity.TrialCriterionId,
 
-                    ExtraIndentification=extraIdentification
+                    ObjectRelationParentId2 = entity.OrganInfoId,
+
+                    ExtraIndentification =extraIdentification
 
                 });
             }