|
|
@ -231,7 +231,7 @@ namespace Shentun.Peis.InternalReports |
|
|
join c in await _itemTypeRepository.GetQueryableAsync() on b.ItemTypeId equals c.Id |
|
|
join c in await _itemTypeRepository.GetQueryableAsync() on b.ItemTypeId equals c.Id |
|
|
join d in await _registerCheckRepository.GetQueryableAsync() on a.RegisterCheckId equals d.Id |
|
|
join d in await _registerCheckRepository.GetQueryableAsync() on a.RegisterCheckId equals d.Id |
|
|
join patientRegister in await _patientRegisterRepository.GetQueryableAsync() on d.PatientRegisterId equals patientRegister.Id |
|
|
join patientRegister in await _patientRegisterRepository.GetQueryableAsync() on d.PatientRegisterId equals patientRegister.Id |
|
|
where (!string.IsNullOrEmpty(d.CheckDoctorId) && d.CheckDate != null) |
|
|
|
|
|
|
|
|
//where (!string.IsNullOrEmpty(d.CheckDoctorId) && d.CheckDate != null)
|
|
|
select new |
|
|
select new |
|
|
{ |
|
|
{ |
|
|
a.AsbitemId, |
|
|
a.AsbitemId, |
|
|
@ -242,6 +242,7 @@ namespace Shentun.Peis.InternalReports |
|
|
ItemTypeId = b.ItemTypeId, |
|
|
ItemTypeId = b.ItemTypeId, |
|
|
ItemTypeName = c.DisplayName, |
|
|
ItemTypeName = c.DisplayName, |
|
|
d.CheckDate, |
|
|
d.CheckDate, |
|
|
|
|
|
d.CheckDoctorId, |
|
|
MedicalTypeId = patientRegister.MedicalTypeId |
|
|
MedicalTypeId = patientRegister.MedicalTypeId |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
@ -264,6 +265,7 @@ namespace Shentun.Peis.InternalReports |
|
|
.Select(s => new GetItemTypeWorkLoadInStandardDto |
|
|
.Select(s => new GetItemTypeWorkLoadInStandardDto |
|
|
{ |
|
|
{ |
|
|
AsbitemName = s.First().AsbitemName, |
|
|
AsbitemName = s.First().AsbitemName, |
|
|
|
|
|
CheckAsbitemCount = s.Where(m => !string.IsNullOrEmpty(m.CheckDoctorId) && m.CheckDate != null).Count(), |
|
|
AsbitemCount = s.Count(), |
|
|
AsbitemCount = s.Count(), |
|
|
ItemTypeName = s.First().ItemTypeName, |
|
|
ItemTypeName = s.First().ItemTypeName, |
|
|
AvgChargePrice = Math.Round(s.Average(v => v.ChargePrice), 2), |
|
|
AvgChargePrice = Math.Round(s.Average(v => v.ChargePrice), 2), |
|
|
|