diff --git a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs index 20ef18b..6a69880 100644 --- a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs +++ b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs @@ -83,7 +83,7 @@ namespace Shentun.Peis.LisRequests { IsPrint = 'N', IsSignIn = 'N', - LisRequestNo = await CreateLisRequestNo(registerAsbitemeList.FirstOrDefault().PatientRegister.OrganizationUnitId.Value), + LisRequestNo = await CreateLisRequestNo(registerAsbitemeList.FirstOrDefault().PatientRegister.OrganizationUnitId), SampleGroupId = sampleGroup.Id, //SampleContainerId = sampleGroup.SampleContainerId, //SampleTypeId = sampleGroup.SampleTypeId @@ -205,7 +205,7 @@ namespace Shentun.Peis.LisRequests { IsPrint = 'N', IsSignIn = 'N', - LisRequestNo = await CreateLisRequestNo(registerAsbitemeList.FirstOrDefault().PatientRegister.OrganizationUnitId.Value), + LisRequestNo = await CreateLisRequestNo(registerAsbitemeList.FirstOrDefault().PatientRegister.OrganizationUnitId), SampleGroupId = sampleGroup.Id }; diff --git a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs index a9d88cc..7869af6 100644 --- a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs +++ b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs @@ -61,7 +61,7 @@ namespace Shentun.Peis.Models /// [Column("customer_org_id")] //[StringLength(8)] - public Guid? CustomerOrgId { get; set; } + public Guid CustomerOrgId { get; set; } /// /// 分组 /// @@ -276,12 +276,12 @@ namespace Shentun.Peis.Models /// 体检中心ID /// [Column("organization_unit_id")] - public Guid? OrganizationUnitId { get; set; } + public Guid OrganizationUnitId { get; set; } /// ///客户单位登记ID 体检次数 /// [Column("customer_org_register_id")] - public Guid? CustomerOrgRegisterId { get; set; } + public Guid CustomerOrgRegisterId { get; set; } [Column("concurrency_stamp")] diff --git a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs index 3d33f71..2cb9958 100644 --- a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs +++ b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs @@ -152,7 +152,7 @@ namespace Shentun.Peis.PatientRegisters SexId = entity.SexId, Telephone = patientEntity.Telephone }; - var patientEnt = await _patientManager.CreateAsync(entity.OrganizationUnitId.Value, ent); + var patientEnt = await _patientManager.CreateAsync(entity.OrganizationUnitId, ent); if (patientEnt != null) { entity.PatientId = patientEnt.Id; @@ -187,8 +187,8 @@ namespace Shentun.Peis.PatientRegisters } - - Guid? CustomerOrgRegisterId = null; //最新单位次数ID + //暂时如此使用,这段代码以后要废除 + Guid CustomerOrgRegisterId = new Guid() ; //最新单位次数ID if (IsMaxMedicalTimes == 'Y') { @@ -242,7 +242,7 @@ namespace Shentun.Peis.PatientRegisters OrganizationUnitId = entity.OrganizationUnitId, PatientId = entity.PatientId, PatientName = entity.PatientName, - PatientRegisterNo = await CreatePatientRegisterNo(entity.OrganizationUnitId.Value), + PatientRegisterNo = await CreatePatientRegisterNo(entity.OrganizationUnitId), PersonnelTypeId = entity.PersonnelTypeId, Photo = entity.Photo, Remark = entity.Remark, @@ -313,7 +313,7 @@ namespace Shentun.Peis.PatientRegisters var patientRegisterNo = entity.PatientRegisterNo; if (string.IsNullOrWhiteSpace(patientRegisterNo)) { - patientRegisterNo = await CreatePatientRegisterNo(entity.OrganizationUnitId.Value); + patientRegisterNo = await CreatePatientRegisterNo(entity.OrganizationUnitId); } if(entity.MedicalTimes == 0) {