判断是否检查

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<GetPatientRegisterItemStatusDto> 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();