33

src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs

@@ -121,12 +121,15 @@ namespace Shentun.Peis.LisRequests
             var result = new PagedResultDto<LisRequestDto>();
             return result;
         }
+
+
         /// <summary>
         /// 生成检验申请单 首次自动生成
         /// </summary>
         /// <param name="PatientRegisterId">人员登记ID</param>
         /// <returns></returns>
         [HttpPost("api/app/LisRequest/SetLisRequest")]
+        [RemoteService(false)]
         public async Task<List<SetLisRequestDto>> SetLisRequestAsync(Guid PatientRegisterId)
         {
             var entlist = await _lisRequestManager.SetLisRequestAsync(PatientRegisterId);

src/Shentun.Peis.Domain/L_JYTMXX_TJs/L_JYTMXX_TJ.cs

@@ -0,0 +1,162 @@
+using Shentun.Peis.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
+
+namespace Shentun.Peis.L_JYTMXX_TJs
+{
+
+    /// <summary>
+    /// LIS对接表
+    /// </summary>
+    [Table("L_JYTMXX_TJ")]
+    public class L_JYTMXX_TJ : Entity<Guid>
+    {
+
+        /// <summary>
+        /// 条码号
+        /// </summary>
+        [Column("DOCTADVISENO")]
+        [StringLength(20)]
+        public string DOCTADVISENO { get; set; }
+
+        /// <summary>
+        /// 病人号码（体检号）
+        /// </summary>
+        [Column("PATIENTID")]
+        [StringLength(18)]
+        public string PATIENTID { get; set; }
+
+        /// <summary>
+        /// 病人姓名
+        /// </summary>
+        [Column("PATIENTNAME")]
+        [StringLength(20)]
+        public string PATIENTNAME { get; set; }
+
+        /// <summary>
+        /// 出生年月  YYYY-MM-DD
+        /// </summary>
+        [Column("BRITHDAY")]
+        public DateTime BRITHDAY { get; set; }
+
+        /// <summary>
+        /// 性别  （1-男，2-女，3-未知，传代码）
+        /// </summary>
+        [Column("SEX")]
+        public char SEX { get; set; }
+
+        /// <summary>
+        /// 检查目的  （合管格式：肝功八项+肾功四项+电解质）
+        /// </summary>
+        [Column("EXAMINAIM")]
+        [StringLength(400)]
+        public string EXAMINAIM { get; set; }
+
+        /// <summary>
+        /// 检查目的代码 （格式：1234^2134^3214代码必须与lis相对应）
+        /// </summary>
+        [Column("EXAMINAIMCODE")]
+        [StringLength(400)]
+        public string EXAMINAIMCODE { get; set; }
+
+        /// <summary>
+        /// 体检科室代码  默认体检科室代码
+        /// </summary>
+        [Column("SECTION")]
+        [StringLength(20)]
+        public string SECTION { get; set; }
+
+        /// <summary>
+        /// 申请人工号或登记人工号
+        /// </summary>
+        [Column("REQUESTER")]
+        [StringLength(20)]
+        public string REQUESTER { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [Column("LXDH")]
+        [StringLength(16)]
+        public string LXDH { get; set; }
+
+        /// <summary>
+        /// 申请日期（登记日期）  （YYYY-MM-DD hh24-mi-ss）
+        /// </summary>
+        [Column("REQUESTTIME")]
+        public DateTime REQUESTTIME { get; set; }
+
+        /// <summary>
+        /// 检验项目总金额
+        /// </summary>
+        [Column("FEE", TypeName = "decimal(7, 2)")]
+        public decimal FEE { get; set; }
+
+        /// <summary>
+        /// 费用状态  （1-未收费  2-已收费） 
+        /// </summary>
+        [Column("FEESTATUS")]
+        public short FEESTATUS { get; set; }
+
+        /// <summary>
+        /// 病人类别  （默认3-体检）
+        /// </summary>
+        [Column("STAYHOSPITALMODE")]
+        public short STAYHOSPITALMODE { get; set; }
+
+        /// <summary>
+        /// 病人性质  （默认1-自费）
+        /// </summary>
+        [Column("BRXZ")]
+        [StringLength(10)]
+        public string BRXZ { get; set; }
+
+
+
+        /// <summary>
+        /// 样本类型  （B -粪便，C -血液，D -尿液，d -血浆，Q-血清，K-痰液。注意大小写）
+        /// </summary>
+        [Column("SAMPLETYPE")]
+        [StringLength(4)]
+        public string SAMPLETYPE { get; set; }
+
+
+        /// <summary>
+        /// 采集日期（条码打印日期）  （YYYY-MM-DD hh24-mi-ss）
+        /// </summary>
+        [Column("EXECUTETIME")]
+        public DateTime EXECUTETIME { get; set; }
+
+        /// <summary>
+        /// 采集者工号
+        /// </summary>
+        [Column("EXECUTOR")]
+        [StringLength(20)]
+        public string EXECUTOR { get; set; }
+
+        /// <summary>
+        /// 样本接收状态  默认：正常
+        /// </summary>
+        [Column("SAMPLE_JSZT")]
+        [StringLength(50)]
+        public string SAMPLE_JSZT { get; set; }
+
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        [Column("SFZH")]
+        [StringLength(20)]
+        public string SFZH { get; set; }
+
+
+
+
+    }
+}

src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs

@@ -53,7 +53,7 @@ namespace Shentun.Peis.LisRequests
 
             List<LisRequest> lisRequests = new List<LisRequest>();
             //根据人员登记ID 查找登记的组合项目
-            var registerCheckAsbitemList = (await _registerCheckAsbitemeRepository.GetDbSetAsync())
+            var registerCheckAsbitemList = (await _registerCheckAsbitemeRepository.GetQueryableAsync())
                 .Include(x => x.Asbitem)
                 .Include(x => x.PatientRegister)
                 .Where(m => m.PatientRegisterId == PatientRegisterId && m.LisRequestId == null)
@@ -75,12 +75,12 @@ namespace Shentun.Peis.LisRequests
         public async Task AppendLisRequestAsync(Guid LisRequestId, List<Guid> RegisterCheckAsbitemIds)
         {
             //根据RegisterAsbitemId
-            var registerAsbitemInIdList = (await _registerCheckAsbitemeRepository.GetDbSetAsync())
+            var registerAsbitemInIdList = (await _registerCheckAsbitemeRepository.GetQueryableAsync())
                  .Include(x => x.RegisterCheck)
                  .Where(m => RegisterCheckAsbitemIds.Contains(m.Id)).ToList();
 
             //根据LisRequestId
-            var registerAsbitemInLisRequestIdList = (await _registerCheckAsbitemeRepository.GetDbSetAsync())
+            var registerAsbitemInLisRequestIdList = (await _registerCheckAsbitemeRepository.GetQueryableAsync())
                  .Include(x => x.RegisterCheck)
                  .Where(m => m.LisRequestId == LisRequestId).ToList();
 
@@ -114,7 +114,7 @@ namespace Shentun.Peis.LisRequests
         {
             List<LisRequest> lisRequests = new List<LisRequest>();
             //根据RegisterAsbitem表ID 查找登记的组合项目
-            var registerAsbitemeList = (await _registerCheckAsbitemeRepository.GetDbSetAsync())
+            var registerAsbitemeList = (await _registerCheckAsbitemeRepository.GetQueryableAsync())
                 .Include(x => x.Asbitem)
                 .Include(x => x.PatientRegister)
                 .Where(m => registerCheckAsbitemIds.Contains(m.Id))
@@ -128,7 +128,7 @@ namespace Shentun.Peis.LisRequests
                 if (sampleGroupDetailList.Any())
                 {
                     //查找条码分组信息  根据条码分组ID
-                    var sampleGroupList = (await _sampleGroupRepository.GetDbSetAsync())
+                    var sampleGroupList = (await _sampleGroupRepository.GetQueryableAsync())
                         .Include(x => x.SampleContainer)
                         .Include(x => x.SampleType)
                         .Where(m => sampleGroupDetailList.Select(s => s.SampleGroupId).Contains(m.Id)).ToList();

src/Shentun.Peis.EntityFrameworkCore/DbMapping/L_JYTMXX_TJs/L_JYTMXX_TJDbMapping.cs

@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using Shentun.Peis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Shentun.Peis.L_JYTMXX_TJs;
+using Shentun.Peis.EntityFrameworkCore;
+
+namespace Shentun.Peis.DbMapping
+{
+ 
+
+    internal class L_JYTMXX_TJDbMapping : IEntityTypeConfiguration<L_JYTMXX_TJ>
+    {
+        public void Configure(EntityTypeBuilder<L_JYTMXX_TJ> entity)
+        {
+            entity.HasComment("LIS对接表");
+            entity.Property(t => t.DOCTADVISENO).IsRequired();
+            entity.Property(t => t.PATIENTID).IsRequired();
+            entity.Property(t => t.PATIENTNAME).IsRequired();
+            entity.Property(t => t.BRITHDAY).IsRequired();
+            entity.Property(t => t.SEX).IsRequired();
+            entity.Property(t => t.EXAMINAIM).IsRequired();
+            entity.Property(t => t.EXAMINAIMCODE).IsRequired();
+            entity.Property(t => t.SECTION).IsRequired();
+            entity.Property(t => t.REQUESTER).IsRequired();
+            entity.Property(t => t.LXDH).IsRequired();
+            entity.Property(t => t.REQUESTTIME).IsRequired();
+            entity.Property(t => t.FEE).IsRequired();
+            entity.Property(t => t.FEESTATUS).IsRequired();
+            entity.Property(t => t.STAYHOSPITALMODE).IsRequired();
+            entity.Property(t => t.BRXZ).IsRequired();
+            entity.Property(t => t.SAMPLETYPE).IsRequired();
+            entity.Property(t => t.EXECUTETIME).IsRequired();
+            entity.Property(t => t.EXECUTOR).IsRequired();
+            entity.Property(t => t.SAMPLE_JSZT).IsRequired();
+            entity.Property(t => t.SFZH).IsRequired();
+
+            entity.Property(e => e.Id)
+                .IsFixedLength()
+                .HasComment("编号").HasColumnName("id");
+
+            entity.ConfigureByConvention();
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs

@@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.Extensions.Logging;
 using Shentun.Peis.Books;
 using Shentun.Peis.DbMapping;
+using Shentun.Peis.L_JYTMXX_TJs;
 using Shentun.Peis.Models;
 using Shentun.Peis.RoleMenuInfos;
 using System;
@@ -315,6 +316,12 @@ public class PeisDbContext :
 
     #endregion
 
+    #region Lis
+
+    public DbSet<L_JYTMXX_TJ> L_JYTMXX_TJs { get; set; } = null!;
+
+    #endregion
+
     public PeisDbContext(DbContextOptions<PeisDbContext> options)
         : base(options)
     {
@@ -540,7 +547,8 @@ public class PeisDbContext :
         .ApplyConfiguration(new ColumnReferencePlugInsDbMapping())
         .ApplyConfiguration(new ColumnReferenceDbMapping())
         .ApplyConfiguration(new ColumnReferenceCodeDbMapping())
-        .ApplyConfiguration(new ColumnReferenceInterfaceDbMapping());
+        .ApplyConfiguration(new ColumnReferenceInterfaceDbMapping())
+        .ApplyConfiguration(new L_JYTMXX_TJDbMapping());
 
         #endregion
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240424094332_init20240424001.cs

@@ -0,0 +1,114 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240424001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "dll_name",
+                table: "column_reference_plug_ins");
+
+            migrationBuilder.AddColumn<string>(
+                name: "assembly_name",
+                table: "column_reference_plug_ins",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: false,
+                defaultValue: "",
+                comment: "Assembly名称");
+
+            migrationBuilder.AddColumn<string>(
+                name: "class_name",
+                table: "column_reference_plug_ins",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: false,
+                defaultValue: "",
+                comment: "Class名称");
+
+            migrationBuilder.AddColumn<int>(
+                name: "display_order",
+                table: "column_reference_plug_ins",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                comment: "显示顺序");
+
+            migrationBuilder.AddColumn<int>(
+                name: "display_order",
+                table: "column_reference",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                comment: "显示顺序");
+
+            migrationBuilder.CreateTable(
+                name: "L_JYTMXX_TJ",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", fixedLength: true, nullable: false, comment: "编号"),
+                    DOCTADVISENO = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    PATIENTID = table.Column<string>(type: "character varying(18)", maxLength: 18, nullable: false),
+                    PATIENTNAME = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    BRITHDAY = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    SEX = table.Column<char>(type: "character(1)", nullable: false),
+                    EXAMINAIM = table.Column<string>(type: "character varying(400)", maxLength: 400, nullable: false),
+                    EXAMINAIMCODE = table.Column<string>(type: "character varying(400)", maxLength: 400, nullable: false),
+                    SECTION = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    REQUESTER = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    LXDH = table.Column<string>(type: "character varying(16)", maxLength: 16, nullable: false),
+                    REQUESTTIME = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    FEE = table.Column<decimal>(type: "numeric(7,2)", nullable: false),
+                    FEESTATUS = table.Column<short>(type: "smallint", nullable: false),
+                    STAYHOSPITALMODE = table.Column<short>(type: "smallint", nullable: false),
+                    BRXZ = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: false),
+                    SAMPLETYPE = table.Column<string>(type: "character varying(4)", maxLength: 4, nullable: false),
+                    EXECUTETIME = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    EXECUTOR = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
+                    SAMPLE_JSZT = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
+                    SFZH = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_L_JYTMXX_TJ", x => x.id);
+                },
+                comment: "LIS对接表");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "L_JYTMXX_TJ");
+
+            migrationBuilder.DropColumn(
+                name: "assembly_name",
+                table: "column_reference_plug_ins");
+
+            migrationBuilder.DropColumn(
+                name: "class_name",
+                table: "column_reference_plug_ins");
+
+            migrationBuilder.DropColumn(
+                name: "display_order",
+                table: "column_reference_plug_ins");
+
+            migrationBuilder.DropColumn(
+                name: "display_order",
+                table: "column_reference");
+
+            migrationBuilder.AddColumn<string>(
+                name: "dll_name",
+                table: "column_reference_plug_ins",
+                type: "character varying(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "",
+                comment: "Dll名称");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -414,6 +414,127 @@ namespace Shentun.Peis.Migrations
                     b.ToTable("test_ct");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.L_JYTMXX_TJs.L_JYTMXX_TJ", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property<DateTime>("BRITHDAY")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("BRITHDAY");
+
+                    b.Property<string>("BRXZ")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("BRXZ");
+
+                    b.Property<string>("DOCTADVISENO")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("DOCTADVISENO");
+
+                    b.Property<string>("EXAMINAIM")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)")
+                        .HasColumnName("EXAMINAIM");
+
+                    b.Property<string>("EXAMINAIMCODE")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)")
+                        .HasColumnName("EXAMINAIMCODE");
+
+                    b.Property<DateTime>("EXECUTETIME")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("EXECUTETIME");
+
+                    b.Property<string>("EXECUTOR")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("EXECUTOR");
+
+                    b.Property<decimal>("FEE")
+                        .HasColumnType("numeric(7,2)")
+                        .HasColumnName("FEE");
+
+                    b.Property<short>("FEESTATUS")
+                        .HasColumnType("smallint")
+                        .HasColumnName("FEESTATUS");
+
+                    b.Property<string>("LXDH")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("LXDH");
+
+                    b.Property<string>("PATIENTID")
+                        .IsRequired()
+                        .HasMaxLength(18)
+                        .HasColumnType("character varying(18)")
+                        .HasColumnName("PATIENTID");
+
+                    b.Property<string>("PATIENTNAME")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("PATIENTNAME");
+
+                    b.Property<string>("REQUESTER")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("REQUESTER");
+
+                    b.Property<DateTime>("REQUESTTIME")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("REQUESTTIME");
+
+                    b.Property<string>("SAMPLETYPE")
+                        .IsRequired()
+                        .HasMaxLength(4)
+                        .HasColumnType("character varying(4)")
+                        .HasColumnName("SAMPLETYPE");
+
+                    b.Property<string>("SAMPLE_JSZT")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("SAMPLE_JSZT");
+
+                    b.Property<string>("SECTION")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("SECTION");
+
+                    b.Property<char>("SEX")
+                        .HasColumnType("character(1)")
+                        .HasColumnName("SEX");
+
+                    b.Property<string>("SFZH")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("SFZH");
+
+                    b.Property<short>("STAYHOSPITALMODE")
+                        .HasColumnType("smallint")
+                        .HasColumnName("STAYHOSPITALMODE");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("L_JYTMXX_TJ");
+
+                    b.HasComment("LIS对接表");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.AbpUserDepartment", b =>
                 {
                     b.Property<Guid>("UserId")
@@ -1750,6 +1871,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("display_name")
                         .HasComment("名称");
 
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasComment("显示顺序");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .IsRequired()
                         .HasColumnType("timestamp without time zone")
@@ -1888,6 +2014,20 @@ namespace Shentun.Peis.Migrations
                         .IsFixedLength()
                         .HasComment("编号");
 
+                    b.Property<string>("AssemblyName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("assembly_name")
+                        .HasComment("Assembly名称");
+
+                    b.Property<string>("ClassName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("class_name")
+                        .HasComment("Class名称");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(40)
@@ -1910,12 +2050,10 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("display_name")
                         .HasComment("名称");
 
-                    b.Property<string>("DllName")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)")
-                        .HasColumnName("dll_name")
-                        .HasComment("Dll名称");
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasComment("显示顺序");
 
                     b.Property<DateTime?>("LastModificationTime")
                         .IsRequired()