Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
						commit
						831832413a
					
				| 
						 | 
					@ -794,7 +794,7 @@ namespace IRaCIS.Core.Application.Service
 | 
				
			||||||
                ["SubjectCode"] = taskInfo.SubjectCode,
 | 
					                ["SubjectCode"] = taskInfo.SubjectCode,
 | 
				
			||||||
                ["VisitName"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitName : taskInfo.ModuleVisitName,
 | 
					                ["VisitName"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitName : taskInfo.ModuleVisitName,
 | 
				
			||||||
                ["EarliestScanDate"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitEarliestScanDate?.ToString("yyyy-MM-dd") : taskInfo.ModuleEarliestScanDate?.ToString("yyyy-MM-dd"),
 | 
					                ["EarliestScanDate"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitEarliestScanDate?.ToString("yyyy-MM-dd") : taskInfo.ModuleEarliestScanDate?.ToString("yyyy-MM-dd"),
 | 
				
			||||||
                ["SignTime"] = taskInfo.SignTime,
 | 
					                ["SignTime"] = taskInfo.SignTime?.ToString("yyyy-MM-dd"),
 | 
				
			||||||
                ["Result"] = answer
 | 
					                ["Result"] = answer
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            };
 | 
					            };
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -261,8 +261,8 @@ namespace IRaCIS.Core.Domain.Models
 | 
				
			||||||
		[ForeignKey("ReadingQuestionCriterionTrialId")]
 | 
							[ForeignKey("ReadingQuestionCriterionTrialId")]
 | 
				
			||||||
		public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; }
 | 
							public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        [JsonIgnore]
 | 
				
			||||||
		public List<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
 | 
					        public List<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      
 | 
					      
 | 
				
			||||||
		[NotMapped]
 | 
							[NotMapped]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue