S-55
							parent
							
								
									79a4ad8cfd
								
							
						
					
					
						commit
						5511d6339e
					
				| 
						 | 
					@ -701,7 +701,7 @@ namespace IRaCIS.Application.Services
 | 
				
			||||||
            var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId??default(Guid))).ToListAsync();
 | 
					            var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId??default(Guid))).ToListAsync();
 | 
				
			||||||
            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
 | 
					            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId).Select(y => new ClinicalFromData()
 | 
					                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    CheckDate = y.CheckDate,
 | 
					                    CheckDate = y.CheckDate,
 | 
				
			||||||
                    ClinicalFormId = y.Id
 | 
					                    ClinicalFormId = y.Id
 | 
				
			||||||
| 
						 | 
					@ -874,7 +874,7 @@ namespace IRaCIS.Application.Services
 | 
				
			||||||
            var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
 | 
					            var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
 | 
				
			||||||
            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
 | 
					            result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId).Select(y => new ClinicalFromData()
 | 
					                x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    CheckDate = y.CheckDate,
 | 
					                    CheckDate = y.CheckDate,
 | 
				
			||||||
                    ClinicalFormId = y.Id
 | 
					                    ClinicalFormId = y.Id
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue