diff --git a/IRaCIS.Core.Domain/SQLFile/Test.sql b/IRaCIS.Core.Domain/SQLFile/Test.sql index de0d80c6..aa9e661d 100644 --- a/IRaCIS.Core.Domain/SQLFile/Test.sql +++ b/IRaCIS.Core.Domain/SQLFile/Test.sql @@ -180,16 +180,6 @@ update DataInspection set Identification='ReadingMedicineQuestionAnswer/Add' , update DataInspection set ObjectTypeId='A4100000-3E2C-0016-A716-08DA7E8DA9BD',OptTypeId='02FCF476-4089-4B2C-B9BE-08DA0E391693',ModuleTypeId='A4460000-3E2C-0016-F305-08DA7E8C40BB' where Identification='ReadingMedicalReview/saveMedicalReviewInfo/TaskMedicalReview/Update' update DataInspection set Identification='ReadingMedicalReviewDialog/Add' , ObjectTypeId='D8270000-3E2C-0016-2A14-08DA3EDB77FD',OptTypeId='02FCF476-4089-4B2C-B9BE-08DA0E391693',ModuleTypeId='A4460000-3E2C-0016-F305-08DA7E8C40BB' where EntityName='ReadingMedicalReviewDialog' ---稽查bug 数据维护 -update DataInspection set TrialReadingCriterionId= substring(JsonDetail,CHARINDEX('TrialCriterionId":"',JsonDetail)+19,36) where EntityName='ReadingTableQuestionTrial' -update DataInspection set TrialReadingCriterionId= substring(JsonDetail,CHARINDEX('ReadingQuestionCriterionTrialId":"',JsonDetail)+34,36) where EntityName='ReadingQuestionTrial' -update DataInspection set TrialReadingCriterionId= GeneralId where EntityName='ReadingQuestionCriterionTrial' - ---维护临床数据状态 -update ReadingClinicalData set IsSign=1 where EXISTS(select * from SubjectVisit where Id=ReadingId and IsBaseLine=1 and IsConfirmedClinicalData=1) -update ReadingClinicalData set ReadingClinicalDataState=3 where IsSign=1 and ReadingClinicalDataState!=3 - - diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 56df4f4d..2662ee16 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -543,35 +543,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common } - //医学审核 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TaskMedicalReview))) - { - var type = GetEntityAuditOpt(item); - - var entity = item.Entity as TaskMedicalReview; - - var extraIdentification = string.Empty; - - //失效的时候 不区分标识 - if (_dbContext.Entry(entity).Property(t => t.IsInvalid).IsModified == true && entity.IsInvalid==true) - { - extraIdentification = $"/Invalid"; - } - - await InsertInspection(entity, type, x => new InspectionConvertDTO() - { - VisitTaskId = entity.VisitTaskId, - - ObjectRelationParentId = entity.VisitTaskId, - - ObjectRelationParentId2 = entity.MedicalManagerUserId, - - ExtraIndentification = extraIdentification, - - IsDistinctionInterface= (type==AuditOpt.Add || extraIdentification !=String.Empty)?false:true - }); - } - //医学审核 问题答案 if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingMedicineQuestionAnswer))) { @@ -606,6 +577,37 @@ namespace IRaCIS.Core.Infra.EFCore.Common } + //医学审核 + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TaskMedicalReview))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as TaskMedicalReview; + + var extraIdentification = string.Empty; + + //失效的时候 不区分标识 + if (_dbContext.Entry(entity).Property(t => t.IsInvalid).IsModified == true && entity.IsInvalid==true) + { + extraIdentification = $"/Invalid"; + } + + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + VisitTaskId = entity.VisitTaskId, + + ObjectRelationParentId = entity.VisitTaskId, + + ObjectRelationParentId2 = entity.MedicalManagerUserId, + + ExtraIndentification = extraIdentification, + + IsDistinctionInterface= (type==AuditOpt.Add || extraIdentification !=String.Empty)?false:true + }); + } + + + //医学审核对话 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingMedicalReviewDialog)))