代码修改
							parent
							
								
									d887e9fe6a
								
							
						
					
					
						commit
						a9a51a76c7
					
				| 
						 | 
				
			
			@ -501,7 +501,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
			
		|||
                 new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetFDGPETOverallAssessment},
 | 
			
		||||
 | 
			
		||||
                 // 影像学整体肿瘤评估
 | 
			
		||||
                 new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetFDGPETOverallAssessment},
 | 
			
		||||
                 new ReadingCalculateData (){QuestionType=QuestionType.ImgOncology,GetStringFun=GetFDGPETOverallAssessment},
 | 
			
		||||
				////靶病灶径线之和(SOD)
 | 
			
		||||
				//new ReadingCalculateData (){QuestionType=QuestionType.SOD,GetDecimalNullFun=GetSODData},
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1895,6 +1895,101 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
			
		|||
          .FirstOrDefault();
 | 
			
		||||
            return resultdata ?? string.Empty;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        #endregion
 | 
			
		||||
 | 
			
		||||
        #region 影像学整体肿瘤评估
 | 
			
		||||
        //public async Task<string> GetImgOncology(ReadingCalculateDto inDto)
 | 
			
		||||
        //{
 | 
			
		||||
        //    if (inDto.IsBaseLine)
 | 
			
		||||
        //    {
 | 
			
		||||
        //        return ImagingOverallAssessment_Lugano.NA.GetEnumInt();
 | 
			
		||||
        //    }
 | 
			
		||||
 | 
			
		||||
        //    // CTandMRI
 | 
			
		||||
        //    var CTandMRIData = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.CTandMRI).Select(x => x.Answer).FirstOrDefault();
 | 
			
		||||
 | 
			
		||||
        //    // FDGPET
 | 
			
		||||
        //    var FDGPETData = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.FDGPET).Select(x => x.Answer).FirstOrDefault();
 | 
			
		||||
 | 
			
		||||
        //    var baseLineTaskId = await GetBaseLineTaskId(inDto);
 | 
			
		||||
        //    // lastFDGPET
 | 
			
		||||
        //    var lastFDGPETData = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.EvidenceFocalFDG).Select(x => x.Answer).FirstOrDefaultAsync();
 | 
			
		||||
 | 
			
		||||
        //    List<CalculationDto> data = new List<CalculationDto>() {
 | 
			
		||||
 | 
			
		||||
        //        //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND/PD/CR/NE/PR/SD	PMD	PMD/CMR/PMR/NMR/NE	PMD/PD
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //          //ND	NE	NE	ND
 | 
			
		||||
        //        new CalculationDto(){
 | 
			
		||||
        //        Column1=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
 | 
			
		||||
        //        Column2=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE }),
 | 
			
		||||
        //        Column3=ReadingCommon.EnumToString(new List<FDGPETOverallAssessment>() { FDGPETOverallAssessment.NE}),
 | 
			
		||||
        //        Column4=ReadingCommon.EnumToString(new List<ImagingOverallAssessment_Lugano>() { ImagingOverallAssessment_Lugano.ND }),
 | 
			
		||||
        //        },
 | 
			
		||||
        //    }
 | 
			
		||||
        //}
 | 
			
		||||
        
 | 
			
		||||
        #endregion
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -925,6 +925,69 @@ namespace IRaCIS.Core.Domain.Share
 | 
			
		|||
        NotEvaluable = 5,
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /// <summary>
 | 
			
		||||
    /// Lugano影像学整体肿瘤评估
 | 
			
		||||
    /// </summary>
 | 
			
		||||
    public enum ImagingOverallAssessment_Lugano
 | 
			
		||||
    {
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// NA
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        NA = -1,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// CMR
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        CMR = 0,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// CR
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        CR = 1,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// PMR
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        PMR = 2,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// PR
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        PR = 3,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// NMR
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        NMR = 4,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// SD
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        SD = 5,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// PMD
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        PMD = 6,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// PD
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        PD = 7,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// NE
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        NE = 8,
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// ND
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        ND = 9,
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /// <summary>
 | 
			
		||||
    /// FDG-PET总体评估
 | 
			
		||||
    /// </summary>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue