diff --git a/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs b/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs index b38bd2e..689f73e 100644 --- a/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs +++ b/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs @@ -2423,6 +2423,7 @@ namespace Shentun.Peis.CustomerReports join customerOrgRegister in await _customerOrgRegisterRepository.GetQueryableAsync() on patientRegister.CustomerOrgRegisterId equals customerOrgRegister.Id join customerOrg in await _customerOrgRepository.GetQueryableAsync() on customerOrgRegister.CustomerOrgId equals customerOrg.Id where patientRegister.CustomerOrgRegisterId != GuidFlag.PersonCustomerOrgRegisterId + && patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration select new { patientRegister, @@ -2494,19 +2495,18 @@ namespace Shentun.Peis.CustomerReports entDto.MedicalStartDate = DataHelper.ConversionDateToString(customerOrgRegisterList.FirstOrDefault(f => f.customerOrgRegisterId == item.Key).beginTime); //登记分组 - var registerGroup = item.Where(m => m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration - || m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Registration).GroupBy(g => g.patientRegister); + var registerGroup = item.Where(m => m.patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration).GroupBy(g => g.patientRegister); //实检分组 var checkGroup = item.Where(m => m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.PartCheck || m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck).GroupBy(g => g.patientRegister); entDto.RegisterCount = registerGroup.Count(); entDto.CheckCount = checkGroup.Count(); - entDto.RegisterStandardAmount = item.Where(m => m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration - || m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Registration).Sum(s => s.standardPrice * s.amount); + entDto.RegisterStandardAmount = item.Where(m => m.patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration) + .Sum(s => s.standardPrice * s.amount); - entDto.RegisterChargeAmount = item.Where(m => m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration - || m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.Registration).Sum(s => s.chargePrice * s.amount); + entDto.RegisterChargeAmount = item.Where(m => m.patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration) + .Sum(s => s.chargePrice * s.amount); entDto.CheckStandardAmount = item.Where(m => m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.PartCheck || m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck).Sum(s => s.standardPrice * s.amount); @@ -2522,6 +2522,8 @@ namespace Shentun.Peis.CustomerReports entDto.CheckItemChargeAmount = item.Where(m => m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.PartCheck || m.patientRegister.CompleteFlag == PatientRegisterCompleteFlag.SumCheck && m.completeFlag != RegisterCheckCompleteFlag.UnChecked).Sum(s => s.chargePrice * s.amount); + + entListDto.Add(entDto); } }