From 88b2520398f151d1828841ec2b42151cc68e72ef Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Mon, 13 May 2024 00:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=89=93=E5=8D=B0pacs=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E3=80=81=E9=A2=84=E7=99=BB=E8=AE=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PrintReports/PrintReportAppService.cs                     | 2 +-
 .../PatientRegisters/PatientRegisterManager.cs                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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
                 };