|
|
|
@ -302,7 +302,7 @@ namespace Shentun.Peis.PrintReports |
|
|
|
requiresNew: false, isTransactional: false |
|
|
|
)) |
|
|
|
{ |
|
|
|
var query2 = (from patient in await _patientRepository.GetQueryableAsync() |
|
|
|
var query = (from patient in await _patientRepository.GetQueryableAsync() |
|
|
|
join patientRegister in await _patientRegisterRepository.GetQueryableAsync() |
|
|
|
on patient.Id equals patientRegister.PatientId |
|
|
|
join sex in await _sexRegisterRepository.GetQueryableAsync() on patientRegister.SexId equals sex.Id |
|
|
|
@ -315,7 +315,7 @@ namespace Shentun.Peis.PrintReports |
|
|
|
from sampleTypeHaveEmpty in ee.DefaultIfEmpty() |
|
|
|
join sampleGroupDetail in await _sampleGroupDetailRepository.GetQueryableAsync() on asbitem.Id equals sampleGroupDetail.AsbitemId into sampleGroupDetailTemp |
|
|
|
from sampleTypeHaveEmptyHaveEmpty in sampleGroupDetailTemp.DefaultIfEmpty() |
|
|
|
join sampleGroup in await _sampleGroupRepository.GetQueryableAsync() |
|
|
|
join sampleGroup in await _sampleGroupRepository.GetQueryableAsync() |
|
|
|
on sampleTypeHaveEmptyHaveEmpty.SampleGroupId equals sampleGroup.Id into sampleGroupTemp |
|
|
|
from sampleGroupHaveEmpty in sampleGroupTemp.DefaultIfEmpty() |
|
|
|
where (patientRegister.Id == input.PatientRegisterId && registerCheckAsbitem.LisRequestId != null) |
|
|
|
@ -332,11 +332,12 @@ namespace Shentun.Peis.PrintReports |
|
|
|
sampleGroupName = sampleGroupHaveEmpty != null ? sampleGroupHaveEmpty.DisplayName : "", |
|
|
|
samplePrintCount = sampleGroupHaveEmpty != null ? sampleGroupHaveEmpty.SamplePrintCount : 0 |
|
|
|
} |
|
|
|
); |
|
|
|
).ToList(); |
|
|
|
|
|
|
|
var ggg = query2.ToQueryString(); |
|
|
|
|
|
|
|
var query = query2.ToList(); |
|
|
|
if (query.Count == 0) |
|
|
|
{ |
|
|
|
return new List<LisRequestReportDto>(); |
|
|
|
} |
|
|
|
|
|
|
|
lisRequests = query.Select(o => o.lisRequest).Distinct().ToList(); |
|
|
|
//发送第三方LIS申请
|
|
|
|
|