问题修改
							parent
							
								
									02b2d8f754
								
							
						
					
					
						commit
						a5ebe97dc5
					
				| 
						 | 
					@ -614,7 +614,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
                 new ReadingCalculateData (){QuestionType=QuestionType.LiverAssessment,GetStringFun=GetLiverAssessment,ComputationTriggerList=new List<ComputationTrigger>(){ ComputationTrigger.InitialCalculation,  ComputationTrigger.LiverStatus,}},
 | 
					                 new ReadingCalculateData (){QuestionType=QuestionType.LiverAssessment,GetStringFun=GetLiverAssessment,ComputationTriggerList=new List<ComputationTrigger>(){ ComputationTrigger.InitialCalculation,  ComputationTrigger.LiverStatus,}},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    // 骨髓中是否存在局灶性 FDG亲和病灶的证据
 | 
					                    // 骨髓中是否存在局灶性 FDG亲和病灶的证据
 | 
				
			||||||
                  new ReadingCalculateData (){QuestionType=QuestionType.EvidenceFocalFDG,GetStringFun=GetEvidenceFocalFDG,ComputationTriggerList=new List<ComputationTrigger>(){  ComputationTrigger.ImageQuality, }},
 | 
					                  new ReadingCalculateData (){QuestionType=QuestionType.EvidenceFocalFDG,GetStringFun=GetEvidenceFocalFDG,ComputationTriggerList=new List<ComputationTrigger>(){ ComputationTrigger.InitialCalculation, ComputationTrigger.ImageQuality, }},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                //CT/MRI
 | 
					                //CT/MRI
 | 
				
			||||||
                new ReadingCalculateData (){QuestionType=QuestionType.CTandMRI,GetStringFun=CTMRIEvaluation,ComputationTriggerList=new List<ComputationTrigger>(){ ComputationTrigger.InitialCalculation,  ComputationTrigger.LiverStatus,ComputationTrigger.SplenicApexPosition,ComputationTrigger.PositionSpleenFloor,ComputationTrigger.SplenicEvaluation,ComputationTrigger.CTSave,ComputationTrigger.MergeSave,ComputationTrigger.RemoveLesion,ComputationTrigger.MergeLesion,}},
 | 
					                new ReadingCalculateData (){QuestionType=QuestionType.CTandMRI,GetStringFun=CTMRIEvaluation,ComputationTriggerList=new List<ComputationTrigger>(){ ComputationTrigger.InitialCalculation,  ComputationTrigger.LiverStatus,ComputationTrigger.SplenicApexPosition,ComputationTrigger.PositionSpleenFloor,ComputationTrigger.SplenicEvaluation,ComputationTrigger.CTSave,ComputationTrigger.MergeSave,ComputationTrigger.RemoveLesion,ComputationTrigger.MergeLesion,}},
 | 
				
			||||||
| 
						 | 
					@ -2672,8 +2672,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
        /// <returns></returns>
 | 
					        /// <returns></returns>
 | 
				
			||||||
        public async Task<string> GetUptakeChange(ReadingCalculateDto inDto)
 | 
					        public async Task<string> GetUptakeChange(ReadingCalculateDto inDto)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
								var existPET = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ExistPET).Select(x => x.Answer).FirstOrDefault();
 | 
				
			||||||
            if (await ImageQualityIsUnableFuse(inDto))
 | 
								if (await ImageQualityIsUnableFuse(inDto)|| existPET.EqEnum(ReadingYesOrNo.No))
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (inDto.IsBaseLine)
 | 
					                if (inDto.IsBaseLine)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
| 
						 | 
					@ -2686,13 +2686,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
				
 | 
									
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			var existPET = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ExistPET).Select(x => x.Answer).FirstOrDefault();
 | 
					 | 
				
			||||||
			//本访视无PET图像
 | 
					 | 
				
			||||||
			if (existPET.EqEnum(ReadingYesOrNo.No))
 | 
					 | 
				
			||||||
			{
 | 
					 | 
				
			||||||
				return SUVChangeVSBaseline.NotEvaluable.GetEnumInt();
 | 
					 | 
				
			||||||
			}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
			//PET5ps评分改变时,才计算
 | 
								//PET5ps评分改变时,才计算
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			List<QuestionType?> needSearchTypes = new List<QuestionType?>()
 | 
								List<QuestionType?> needSearchTypes = new List<QuestionType?>()
 | 
				
			||||||
| 
						 | 
					@ -2936,7 +2929,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
        public async Task<string> GetEvidenceFocalFDG(ReadingCalculateDto inDto)
 | 
					        public async Task<string> GetEvidenceFocalFDG(ReadingCalculateDto inDto)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (await ImageQualityIsUnableFuse(inDto))
 | 
					            if (await ImageQualityIsUnableFuse(inDto)|| inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (inDto.IsBaseLine)
 | 
					                if (inDto.IsBaseLine)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
| 
						 | 
					@ -2947,11 +2940,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
					return FDGAffinityFociInBM.NE.GetEnumInt();
 | 
										return FDGAffinityFociInBM.NE.GetEnumInt();
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					 | 
				
			||||||
            if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt()))
 | 
					 | 
				
			||||||
            {
 | 
					 | 
				
			||||||
                return FDGAffinityFociInBM.NE.GetEnumInt();
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                return inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.EvidenceFocalFDG).Select(x => x.Answer).FirstOrDefault()??string.Empty;
 | 
					                return inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.EvidenceFocalFDG).Select(x => x.Answer).FirstOrDefault()??string.Empty;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue