From dcf2e3265cdb43fb2f2cadc69b2e613650f4ec3d Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Sun, 12 May 2024 20:45:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientRegisterAppService.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index 51d0f9e..5af69e0 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -1083,6 +1083,8 @@ namespace Shentun.Peis.PatientRegisters from ac in cc.DefaultIfEmpty() join d in await _registerCheckAsbitemRepository.GetQueryableAsync() on ac.Id equals d.RegisterCheckId into dd from ad in dd.DefaultIfEmpty() + join e in await _asbitemRepository.GetQueryableAsync() on ad.AsbitemId equals e.Id + where e.IsCheck == 'Y' select new { a, @@ -1324,6 +1326,8 @@ namespace Shentun.Peis.PatientRegisters from ac in cc.DefaultIfEmpty() join d in await _registerCheckAsbitemRepository.GetQueryableAsync() on ac.Id equals d.RegisterCheckId into dd from ad in dd.DefaultIfEmpty() + join e in await _asbitemRepository.GetQueryableAsync() on ad.AsbitemId equals e.Id + where e.IsCheck == 'Y' select new { a, @@ -1431,7 +1435,9 @@ namespace Shentun.Peis.PatientRegisters - if (input.CompleteFlag != null && input.CompleteFlag != PatientRegisterCompleteFlag.ItemCheckUnSumCheck) + if (input.CompleteFlag != null + && input.CompleteFlag != PatientRegisterCompleteFlag.ItemCheckUnSumCheck + && input.CompleteFlag != PatientRegisterCompleteFlag.PartCheck) { sumquery = sumquery.Where(m => m.a.CompleteFlag == input.CompleteFlag); } @@ -3026,13 +3032,16 @@ namespace Shentun.Peis.PatientRegisters public async Task GetPatientRegisterItemStatusAsync(Guid PatientRegisterId) { //未检组合项目 - var UnCheckedAsbitem = (await _registerCheckAsbitemRepository.GetDbSetAsync()) + var UnCheckedAsbitem = (await _registerCheckAsbitemRepository.GetQueryableAsync()) .Include(x => x.Asbitem) .Include(x => x.RegisterCheck) - .Where(m => m.PatientRegisterId == PatientRegisterId && m.RegisterCheck.CompleteFlag == RegisterCheckCompleteFlag.UnChecked).OrderBy(o => o.Asbitem.DisplayOrder).Select(s => s.Asbitem.DisplayName).ToList(); + .Where(m => m.PatientRegisterId == PatientRegisterId + && m.RegisterCheck.CompleteFlag == RegisterCheckCompleteFlag.UnChecked + && m.Asbitem.IsCheck == 'Y') + .OrderBy(o => o.Asbitem.DisplayOrder).Select(s => s.Asbitem.DisplayName).ToList(); //弃检检组合项目 - var GiveUpAsbitem = (await _registerCheckAsbitemRepository.GetDbSetAsync()) + var GiveUpAsbitem = (await _registerCheckAsbitemRepository.GetQueryableAsync()) .Include(x => x.Asbitem) .Include(x => x.RegisterCheck) .Where(m => m.PatientRegisterId == PatientRegisterId && m.RegisterCheck.CompleteFlag == RegisterCheckCompleteFlag.GiveUpChecked).OrderBy(o => o.Asbitem.DisplayOrder).Select(s => s.Asbitem.DisplayName).ToList();