打印pacs条码、预登记修改

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,

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