Uat_Study
			
			
		
		
							parent
							
								
									f0bcf2d070
								
							
						
					
					
						commit
						c6b36bf805
					
				| 
						 | 
					@ -227,6 +227,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
                            QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
 | 
					                            QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
 | 
				
			||||||
                            QuestionId = x.ReadingQuestionId,
 | 
					                            QuestionId = x.ReadingQuestionId,
 | 
				
			||||||
                            TableQuestionId = x.Id,
 | 
					                            TableQuestionId = x.Id,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                            Type = x.Type,
 | 
					                            Type = x.Type,
 | 
				
			||||||
                            LesionType = question.LesionType,
 | 
					                            LesionType = question.LesionType,
 | 
				
			||||||
                            TableQuestionType = x.TableQuestionType,
 | 
					                            TableQuestionType = x.TableQuestionType,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -207,7 +207,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
                            Type = x.Type,
 | 
					                            Type = x.Type,
 | 
				
			||||||
                            LesionType = question.LesionType,
 | 
					                            LesionType = question.LesionType,
 | 
				
			||||||
                            TableQuestionType = x.TableQuestionType,
 | 
					                            TableQuestionType = x.TableQuestionType,
 | 
				
			||||||
                            
 | 
					                            RowId=row.RowId,
 | 
				
			||||||
                            DataSource = x.DataSource,
 | 
					                            DataSource = x.DataSource,
 | 
				
			||||||
                            DictionaryCode = x.DictionaryCode,
 | 
					                            DictionaryCode = x.DictionaryCode,
 | 
				
			||||||
                            QuestionMark = x.QuestionMark,
 | 
					                            QuestionMark = x.QuestionMark,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -183,6 +183,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
                    question.Childrens = rowlist.Select(x => new ReadingReportDto()
 | 
					                    question.Childrens = rowlist.Select(x => new ReadingReportDto()
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
 | 
					                        QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
 | 
					                        SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
 | 
				
			||||||
                        SplitOrMergeType = x.SplitOrMergeType,
 | 
					                        SplitOrMergeType = x.SplitOrMergeType,
 | 
				
			||||||
                        LesionType = question.LesionType,
 | 
					                        LesionType = question.LesionType,
 | 
				
			||||||
| 
						 | 
					@ -209,6 +210,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
                            QuestionMark = x.QuestionMark,
 | 
					                            QuestionMark = x.QuestionMark,
 | 
				
			||||||
                            TypeValue = x.TypeValue,
 | 
					                            TypeValue = x.TypeValue,
 | 
				
			||||||
                            RowIndex = row.RowIndex,
 | 
					                            RowIndex = row.RowIndex,
 | 
				
			||||||
 | 
					                            RowId=row.RowId,
 | 
				
			||||||
                            ShowOrder = x.ShowOrder,
 | 
					                            ShowOrder = x.ShowOrder,
 | 
				
			||||||
                            ValueType = x.ValueType,
 | 
					                            ValueType = x.ValueType,
 | 
				
			||||||
                            CustomUnit=x.CustomUnit,
 | 
					                            CustomUnit=x.CustomUnit,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue