稽查修改
							parent
							
								
									83b6fe7cb2
								
							
						
					
					
						commit
						2f50c17320
					
				| 
						 | 
					@ -1439,6 +1439,12 @@
 | 
				
			||||||
            </summary>
 | 
					            </summary>
 | 
				
			||||||
            <returns></returns>
 | 
					            <returns></returns>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
 | 
					        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetFirstChangeTaskId(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
 | 
				
			||||||
 | 
					            <summary>
 | 
				
			||||||
 | 
					            获取第一次转变访视任务Id
 | 
				
			||||||
 | 
					            </summary>
 | 
				
			||||||
 | 
					            <returns></returns>
 | 
				
			||||||
 | 
					        </member>
 | 
				
			||||||
        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECISTTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
 | 
					        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECISTTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
 | 
				
			||||||
        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECISTNoTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
 | 
					        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECISTNoTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
 | 
				
			||||||
        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
 | 
					        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
 | 
				
			||||||
| 
						 | 
					@ -7432,9 +7438,9 @@
 | 
				
			||||||
            满足RECISTPD
 | 
					            满足RECISTPD
 | 
				
			||||||
            </summary>
 | 
					            </summary>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.SODAddGreaterThan5">
 | 
					        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.SODTiggerAddGreaterThan5">
 | 
				
			||||||
            <summary>
 | 
					            <summary>
 | 
				
			||||||
            本次访视SOD增加不小于5mm
 | 
					            本次访视SOD与触发iRECIST访视相比本次访视SOD增加不小于5mm
 | 
				
			||||||
            </summary>
 | 
					            </summary>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.LowSodAddGreaterThan20Percent">
 | 
					        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.LowSodAddGreaterThan20Percent">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -951,14 +951,57 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            #region 热键  模板 个性化配置
 | 
					            #region 热键  模板 个性化配置
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (entitys.Any(x => x.Entity.GetType() == typeof(ShortcutKey)))
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                var type = AuditOpt.Add;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                var list = entitys.Where(x => x.Entity.GetType() == typeof(ShortcutKey)).Select(t => t.Entity as ShortcutKey);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            #endregion
 | 
					                
 | 
				
			||||||
 | 
					                var firstEntity = list.FirstOrDefault();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                var cloneEntity = firstEntity.Clone();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                //保证Id 唯一
 | 
				
			||||||
 | 
					                cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.UserId.ToString(), firstEntity.CreateUserId.ToString());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO()
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    
 | 
				
			||||||
 | 
					                    //byzhouhang
 | 
				
			||||||
 | 
					                    ObjectRelationParentId = x.UserId,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    IsDistinctionInterface = false,
 | 
				
			||||||
 | 
					                }, new
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    ShortcutKeyList = list,
 | 
				
			||||||
 | 
					                });
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserWLTemplate)))
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                var type = GetEntityAuditOpt(item);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                var entity = item.Entity as UserWLTemplate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                var extraIdentification = string.Empty;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					               
 | 
				
			||||||
 | 
					                await InsertInspection<UserWLTemplate>(entity, type, x => new InspectionConvertDTO()
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    IsDistinctionInterface = false,
 | 
				
			||||||
 | 
					                  
 | 
				
			||||||
 | 
					                    ObjectRelationParentId = entity.UserId
 | 
				
			||||||
 | 
					                });
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					                
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                #endregion
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            #region 附加评估
 | 
					            #region 附加评估
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // 是否参与附加评估记录表
 | 
					            // 是否参与附加评估记录表
 | 
				
			||||||
            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectCriteriaEvaluation)))
 | 
					                foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectCriteriaEvaluation)))
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                var type = GetEntityAuditOpt(item);
 | 
					                var type = GetEntityAuditOpt(item);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2166,9 +2209,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                var entity = item.Entity as User;
 | 
					                var entity = item.Entity as User;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                var extraIdentification = string.Empty;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                //保存其他个性化配置
 | 
				
			||||||
 | 
					                if (_userInfo.RequestUrl == "UserWLTemplate/setAutoCutNextTask")
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    extraIdentification = "/Personalization";
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                await InsertInspection<User>(entity, type, x => new InspectionConvertDTO()
 | 
					                await InsertInspection<User>(entity, type, x => new InspectionConvertDTO()
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    IsDistinctionInterface = false
 | 
					                    IsDistinctionInterface = false,
 | 
				
			||||||
 | 
					                    ExtraIndentification= extraIdentification
 | 
				
			||||||
                }, new
 | 
					                }, new
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    UserRealName = entity.FullName,
 | 
					                    UserRealName = entity.FullName,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue