|
|
@ -872,6 +872,7 @@ namespace Shentun.Peis.RegisterAsbitems |
|
|
join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId |
|
|
join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId |
|
|
join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId |
|
|
join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId |
|
|
join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.Id |
|
|
join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.Id |
|
|
|
|
|
join itemType in await _itemTypeRepository.GetQueryableAsync() on asbitem.ItemTypeId equals itemType.Id |
|
|
join medicalCenter in await _organizationUnitRepository.GetQueryableAsync() on registerCheckAsbitem.MedicalCenterId equals medicalCenter.Id into medicalCenterTemp |
|
|
join medicalCenter in await _organizationUnitRepository.GetQueryableAsync() on registerCheckAsbitem.MedicalCenterId equals medicalCenter.Id into medicalCenterTemp |
|
|
from medicalCenterHaveEmpty in medicalCenterTemp.DefaultIfEmpty() |
|
|
from medicalCenterHaveEmpty in medicalCenterTemp.DefaultIfEmpty() |
|
|
select new |
|
|
select new |
|
|
@ -881,6 +882,7 @@ namespace Shentun.Peis.RegisterAsbitems |
|
|
registerCheck, |
|
|
registerCheck, |
|
|
registerCheckAsbitem, |
|
|
registerCheckAsbitem, |
|
|
asbitem, |
|
|
asbitem, |
|
|
|
|
|
itemType, |
|
|
medicalCenterHaveEmpty |
|
|
medicalCenterHaveEmpty |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
@ -894,7 +896,7 @@ namespace Shentun.Peis.RegisterAsbitems |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var entListDto = query.ToList().Select(s => new GetRegisterCheckAsbitemWithMedicalCenterDto |
|
|
|
|
|
|
|
|
var entListDto = query.ToList().OrderBy(o => o.itemType.DisplayOrder).ThenBy(o => o.asbitem.DisplayOrder).Select(s => new GetRegisterCheckAsbitemWithMedicalCenterDto |
|
|
{ |
|
|
{ |
|
|
RegisterCheckAsbitemId = s.registerCheckAsbitem.Id, |
|
|
RegisterCheckAsbitemId = s.registerCheckAsbitem.Id, |
|
|
AsbitemName = s.asbitem.DisplayName, |
|
|
AsbitemName = s.asbitem.DisplayName, |
|
|
|