diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index a7aceed..0d1f6e2 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -525,7 +525,7 @@ namespace Shentun.Peis.PrintReports { Age = s.FirstOrDefault().Age, AsbitemName = string.Join(',', s.Select(s => s.AsbitemName)), - CheckRequestNo = s.FirstOrDefault().CheckRequestNo, + CheckRequestNo = s.FirstOrDefault().PatientRegisterNo, PatientName = s.FirstOrDefault().PatientName, PatientRegisterNo = s.FirstOrDefault().PatientRegisterNo, SexName = s.FirstOrDefault().SexName, diff --git a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs index ea5c423..226f080 100644 --- a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs +++ b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs @@ -296,7 +296,7 @@ namespace Shentun.Peis.PatientRegisters } string patientRegisterNo; - if (entity.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration) + if (entity.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration) { patientRegisterNo = await CreatePrePatientRegisterNo(); } @@ -929,7 +929,7 @@ namespace Shentun.Peis.PatientRegisters primarykeyBuilderEnt = new PrimarykeyBuilder { - PrimarykeyBuilderId = "patient_register_no", + PrimarykeyBuilderId = "pre_patient_register_no", DateString = date, SerialNo = maxnum };