shentun
/
peis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去掉已审核判断

bjmzak
wxd 1 year ago
parent
9f554f2db4
commit
d5711ac7d9
2 changed files with 3 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs
  2. 1
      src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs

6
src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs
View File

@ -143,7 +143,7 @@ namespace Shentun.Peis.SumSummaryReports
join itemType in await _itemTypeRepository.GetQueryableAsync()
on asbitem.ItemTypeId equals itemType.Id
where patient.Id == list.First().patient.Id
&& (patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck || patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Audit)
&& patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck
&& patientRegister.MedicalTimes < list.First().patientRegister.MedicalTimes
&& registerCheck.CompleteFlag == RegisterCheckCompleteFlag.Checked
&& asbitem.IsCheck == 'Y'
@ -382,7 +382,7 @@ namespace Shentun.Peis.SumSummaryReports
join itemType in await _itemTypeRepository.GetQueryableAsync()
on asbitem.ItemTypeId equals itemType.Id
where patient.Id == input.PatientId
&& (patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck || patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Audit)
&& patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck
&& registerCheck.CompleteFlag == RegisterCheckCompleteFlag.Checked
&& asbitem.IsCheck == 'Y'
select new
@ -459,7 +459,7 @@ namespace Shentun.Peis.SumSummaryReports
join item in await _itemRepository.GetQueryableAsync()
on registerCheckItem.ItemId equals item.Id
where patient.Id == input.PatientId
&& (patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck || patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Audit)
&& patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck
&& registerCheck.CompleteFlag == RegisterCheckCompleteFlag.Checked
&& asbitem.IsCheck == 'Y'
&& asbitem.Id == input.AsbitemId

1
src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs
View File

@ -89,7 +89,6 @@ namespace Shentun.Peis.LisRequests
where patientRegister.Id == patientRegisterId
&& patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration
&& patientRegister.CompleteFlag != PatientRegisterCompleteFlag.SumCheck
&& patientRegister.CompleteFlag != PatientRegisterCompleteFlag.Audit
&& itemType.CheckTypeFlag == CheckTypeFlag.Laboratory
&& registerCheck.CompleteFlag == RegisterCheckCompleteFlag.UnChecked
select new

Write Preview
Loading…
Cancel
Save