From 90b5bfb15feb5f13a71288e2c24b5c4f6cae75a1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Mon, 3 Jun 2024 01:29:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeRequestPlugInsGemTest.cs | 12 ++++++++++++ .../ImportLisResultPlugInsTest.cs | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/ChargeRequestPlugInsGemTest.cs b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/ChargeRequestPlugInsGemTest.cs index 908eeeb2..f3b6d372 100644 --- a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/ChargeRequestPlugInsGemTest.cs +++ b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/ChargeRequestPlugInsGemTest.cs @@ -15,5 +15,17 @@ namespace Shentun.Peis.PlugIns.Gem.Test _output = testOutputHelper; } + + [Fact] + public async Task ImportResultAsync() + { + + + var input = new ChargeRequestPlugInsGem(new Guid("1c8cb151-cbc6-4ab5-b50b-0644bf2d515c")); + var loginResult = input.LoginAsync().Result; + await input.SyncChargeRequestFlagFromInterfaceAsync(new Guid("3a12cf84-4516-49d6-345f-87c17ed6b252")); + + + } } } diff --git a/test/Shentun.Peis.ColumnReference.Tests/ImportLisResultPlugInsTest.cs b/test/Shentun.Peis.ColumnReference.Tests/ImportLisResultPlugInsTest.cs index 559f0bb8..b6b7a580 100644 --- a/test/Shentun.Peis.ColumnReference.Tests/ImportLisResultPlugInsTest.cs +++ b/test/Shentun.Peis.ColumnReference.Tests/ImportLisResultPlugInsTest.cs @@ -36,7 +36,7 @@ namespace Shentun.Peis.PlugIns.Tests string filePath = DirectoryHelper.GetAppDirectory() + "/appsettings.json"; configParm = File.ReadAllText(filePath); - var input = new ImportLisResultPlugInsDbBase(configParm); + var input = new ImportLisResultPlugInsDbBase(new Guid("77f74058-4393-4e8b-a487-c27faa58be6b")); await input.DoWork(); From f00adcded70a60969e62fe94fa2fb6dd393b907b Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Mon, 3 Jun 2024 01:52:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=84=E5=90=88=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Shentun.Peis.Domain/Asbitems/Asbitem.cs | 9 +++++++++ .../DbMapping/Asbitems/AsbitemDbMapping.cs | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs index 463455ad..657bdc92 100644 --- a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs +++ b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs @@ -173,6 +173,15 @@ namespace Shentun.Peis.Models [Column("warn")] public string Warn { get; set; } + /// + /// 备孕期间禁止检查 + /// + public char IsDisablePreparePregnancy { get; set; } + /// + /// 怀孕期间禁止检查 + /// + public char IsDisablePregnancy { get; set; } + [Column("concurrency_stamp")] public string ConcurrencyStamp { get; set; } diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs index 8e3d6d73..afb69f25 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs @@ -36,8 +36,8 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.IsActive).HasComment("是启用").IsRequired().HasDefaultValueSql("'Y'"); entity.Property(t => t.BarcodeMode).HasComment("条码模式").IsRequired().HasDefaultValueSql("'0'"); entity.Property(t => t.IsWebAppoint).HasComment("是否支持网上预约").IsRequired().HasDefaultValueSql("'Y'"); - - + entity.Property(t => t.IsDisablePreparePregnancy).HasComment("备孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'"); + entity.Property(t => t.IsDisablePregnancy).HasComment("怀孕期间禁止检查").IsRequired().HasDefaultValueSql("'N'"); entity.Property(e => e.Id) .IsFixedLength() .HasComment("编号").HasColumnName("id"); From 1fb33f36773e71c4c249c58b9c382ee0b12c4b53 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Mon, 3 Jun 2024 02:01:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E5=90=88=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Shentun.Peis.Domain/Asbitems/Asbitem.cs | 5 +++++ .../PatientRegisters/PatientRegister.cs | 7 ++++++- .../DbMapping/PatientRegisters/PatientRegisterDbMapping.cs | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs index 657bdc92..80983dbb 100644 --- a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs +++ b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs @@ -164,6 +164,7 @@ namespace Shentun.Peis.Models /// 疾病筛查类别 /// [Column("disease_screening_type_id")] + public Guid? DiseaseScreeningTypeId { get; set; } /// @@ -176,10 +177,14 @@ namespace Shentun.Peis.Models /// /// 备孕期间禁止检查 /// + [MaxLength(1)] + [Column("is_disable_prepare_pregnancy")] public char IsDisablePreparePregnancy { get; set; } /// /// 怀孕期间禁止检查 /// + [MaxLength(1)] + [Column("is_disable_pregnancy")] public char IsDisablePregnancy { get; set; } [Column("concurrency_stamp")] diff --git a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs index cf1951ba..17b71bd6 100644 --- a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs +++ b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs @@ -301,7 +301,12 @@ namespace Shentun.Peis.Models /// [Column("customer_org_register_id")] public Guid CustomerOrgRegisterId { get; set; } - + /// + /// 预约人员登记ID + /// + + [Column("appoint_patient_register_id")] + public Guid? AppointPatientRegisterId { get; set; } [Column("concurrency_stamp")] public string ConcurrencyStamp { get; set; } diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisters/PatientRegisterDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisters/PatientRegisterDbMapping.cs index 57a8a4ee..21ef0fe4 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisters/PatientRegisterDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisters/PatientRegisterDbMapping.cs @@ -97,7 +97,7 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.Remark).HasComment("备注"); entity.Property(t => t.MedicalCenterId).HasComment("体检中心ID").IsRequired(); entity.Property(t => t.CustomerOrgRegisterId).HasComment("客户单位登记ID").HasDefaultValue(Guid.Empty); - + entity.Property(t => t.AppointPatientRegisterId).HasComment("预约人员登记ID"); //entity.HasOne(d => d.CustomerOrgRegister) // .WithMany(p => p.PatientRegisters)