第三方接口

src/Shentun.Peis.Application.Contracts/ThirdInterfaces/CreateThirdInterfaceDto.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.ThirdInterfaces
+{
+    public class CreateThirdInterfaceDto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// 接口类型
+        /// </summary>
+        public string ThirdInterfaceType { get; set; }
+
+        /// <summary>
+        /// 配置参数
+        /// </summary>
+        public string ParmValue { get; set; }
+
+        /// <summary>
+        /// 体检中心ID
+        /// </summary>
+        public Guid MedicalCenterId { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public char IsActive { get; set; }
+
+ 
+    }
+}

src/Shentun.Peis.Application.Contracts/ThirdInterfaces/DeleteThirdInterfaceDto.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.ThirdInterfaces
+{
+    public class DeleteThirdInterfaceDto
+    {
+        public Guid Id { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/ThirdInterfaces/ThirdInterfaceDto.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace Shentun.Peis.ThirdInterfaces
+{
+    public class ThirdInterfaceDto : AuditedEntityDtoName
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// 接口类型
+        /// </summary>
+        public string ThirdInterfaceType { get; set; }
+
+        /// <summary>
+        /// 配置参数
+        /// </summary>
+        public string ParmValue { get; set; }
+
+        /// <summary>
+        /// 体检中心ID
+        /// </summary>
+        public Guid MedicalCenterId { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public char IsActive { get; set; }
+
+
+        public int DisplayOrder { get; set; }
+
+
+    }
+}

src/Shentun.Peis.Application.Contracts/ThirdInterfaces/UpdateThirdInterfaceDto.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.ThirdInterfaces
+{
+    public class UpdateThirdInterfaceDto
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// 接口类型
+        /// </summary>
+        public string ThirdInterfaceType { get; set; }
+
+        /// <summary>
+        /// 配置参数
+        /// </summary>
+        public string ParmValue { get; set; }
+
+        /// <summary>
+        /// 体检中心ID
+        /// </summary>
+        public Guid MedicalCenterId { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public char IsActive { get; set; }
+    }
+}

src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs

@@ -69,6 +69,7 @@ using Shentun.Peis.SumSummaryReports;
 using Shentun.Peis.SysParms;
 using Shentun.Peis.SysParmTypes;
 using Shentun.Peis.SysParmValues;
+using Shentun.Peis.ThirdInterfaces;
 using Shentun.Peis.Units;
 using System;
 using Volo.Abp.Identity;
@@ -448,6 +449,10 @@ public class PeisApplicationAutoMapperProfile : Profile
         CreateMap<CreateColumnReferenceDto, ColumnReference>();
         CreateMap<UpdateColumnReferenceDto, ColumnReference>();
 
+        CreateMap<ThirdInterface, ThirdInterfaceDto>();
+        CreateMap<CreateThirdInterfaceDto, ThirdInterface>();
+        CreateMap<UpdateThirdInterfaceDto, ThirdInterface>();
+        
 
     }
 }

src/Shentun.Peis.Application/ThirdInterfaces/ThirdInterfaceAppService.cs

@@ -0,0 +1,136 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Shentun.Peis.HelperDto;
+using Shentun.Peis.Items;
+using Shentun.Peis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.ObjectMapping;
+using Volo.Abp.Users;
+
+namespace Shentun.Peis.ThirdInterfaces
+{
+    /// <summary>
+    /// 第三方接口
+    /// </summary>
+    [ApiExplorerSettings(GroupName = "Work")]
+    [Authorize]
+    public class ThirdInterfaceAppService : ApplicationService
+    {
+        private readonly IRepository<ThirdInterface, Guid> _thirdInterfaceRepository;
+        private readonly CacheService _cacheService;
+        private readonly ThirdInterfaceManager _thirdInterfaceManager;
+
+        public ThirdInterfaceAppService(
+            IRepository<ThirdInterface, Guid> thirdInterfaceRepository,
+            CacheService cacheService,
+            ThirdInterfaceManager thirdInterfaceManager)
+        {
+            _thirdInterfaceRepository = thirdInterfaceRepository;
+            _cacheService = cacheService;
+            _thirdInterfaceManager = thirdInterfaceManager;
+        }
+
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("api/app/ThirdInterface/GetList")]
+        public async Task<List<ThirdInterfaceDto>> GetListAsync()
+        {
+            var thirdInterfaceList = await _thirdInterfaceRepository.GetQueryableAsync();
+            return thirdInterfaceList.Select(s => new ThirdInterfaceDto
+            {
+                CreationTime = s.CreationTime,
+                CreatorId = s.CreatorId,
+                DisplayName = s.DisplayName,
+                DisplayOrder = s.DisplayOrder,
+                Id = s.Id,
+                IsActive = s.IsActive,
+                LastModificationTime = s.LastModificationTime,
+                LastModifierId = s.LastModifierId,
+                CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).Result,
+                LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).Result,
+                MedicalCenterId = s.MedicalCenterId,
+                ParmValue = s.ParmValue,
+                ThirdInterfaceType = s.ThirdInterfaceType
+            }).OrderBy(o => o.DisplayOrder).ToList();
+        }
+
+
+        /// <summary>
+        /// 创建
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("api/app/ThirdInterface/Create")]
+        public async Task<ThirdInterfaceDto> CreateAsync(CreateThirdInterfaceDto input)
+        {
+            var createEntity = ObjectMapper.Map<CreateThirdInterfaceDto, ThirdInterface>(input);
+            var entity = await _thirdInterfaceManager.CreateAsync(createEntity);
+            entity = await _thirdInterfaceRepository.InsertAsync(entity);
+            var dto = ObjectMapper.Map<ThirdInterface, ThirdInterfaceDto>(entity);
+            dto.CreatorName = await _cacheService.GetSurnameAsync(dto.CreatorId);
+            dto.LastModifierName = await _cacheService.GetSurnameAsync(dto.LastModifierId);
+            return dto;
+        }
+
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/app/ThirdInterface/Update")]
+        public async Task<ThirdInterfaceDto> UpdateAsync(UpdateThirdInterfaceDto input)
+        {
+            var entity = await _thirdInterfaceRepository.GetAsync(input.Id);
+            var sourceEntity = ObjectMapper.Map<UpdateThirdInterfaceDto, ThirdInterface>(input);
+            _thirdInterfaceManager.UpdateAsync(sourceEntity, entity);
+            entity = await _thirdInterfaceRepository.UpdateAsync(entity);
+            var dto = ObjectMapper.Map<ThirdInterface, ThirdInterfaceDto>(entity);
+            dto.CreatorName = await _cacheService.GetSurnameAsync(dto.CreatorId);
+            dto.LastModifierName = await _cacheService.GetSurnameAsync(dto.LastModifierId);
+            return dto;
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/app/ThirdInterface/Update")]
+        public async Task DeleteAsync(DeleteThirdInterfaceDto input)
+        {
+            await _thirdInterfaceManager.CheckAndDeleteAsync(input.Id);
+        }
+
+
+        /// <summary>
+        /// 修改排序  置顶，置底
+        /// </summary>
+        /// <param name="id">需要修改的ID</param>
+        /// <param name="SortType">修改方式：1 置顶   2 置底</param>
+        /// <returns></returns>
+        [HttpPut("api/app/ThirdInterface/UpdateManySort")]
+        public async Task UpdateManySortAsync(Guid id, int SortType)
+        {
+            await _thirdInterfaceManager.UpdateManySortAsync(id, SortType);
+        }
+
+        /// <summary>
+        ///  修改排序  拖拽
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPut("api/app/ThirdInterface/UpdateSortMany")]
+        public async Task UpdateSortManyAsync(UpdateSortManyDto input)
+        {
+            await _thirdInterfaceManager.UpdateSortManyAsync(input);
+        }
+    }
+}

src/Shentun.Peis.Domain/ThirdInterfaces/ThirdInterface.cs

@@ -10,6 +10,9 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Shentun.Peis.Models
 {
+    /// <summary>
+    /// 第三方接口表
+    /// </summary>
     [Table("third_interface")]
     public class ThirdInterface : AuditedEntity<Guid>, IDisplayName, IHasConcurrencyStamp, IDisplayOrder
     {
@@ -37,9 +40,8 @@ namespace Shentun.Peis.Models
         public string ParmValue { get; set; }
 
         /// <summary>
-        /// 单位ID
+        /// 体检中心ID
         /// </summary>
-        [Key]
         [Column("medical_center_id")]
         public Guid MedicalCenterId { get; set; }
         /// <summary>

src/Shentun.Peis.Domain/ThirdInterfaces/ThirdInterfaceManager.cs

@@ -0,0 +1,128 @@
+using Shentun.Peis.Enums;
+using Shentun.Peis.Models;
+using Shentun.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp;
+using Volo.Abp.Domain.Services;
+using Shentun.Peis.HelperDto;
+
+namespace Shentun.Peis.ThirdInterfaces
+{
+    public class ThirdInterfaceManager : DomainService
+    {
+        private readonly IRepository<ThirdInterface, Guid> _thirdInterfaceRepository;
+
+        public ThirdInterfaceManager(
+            IRepository<ThirdInterface, Guid> thirdInterfaceRepository
+            )
+        {
+            _thirdInterfaceRepository = thirdInterfaceRepository;
+        }
+
+        /// <summary>
+        /// 创建
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<ThirdInterface> CreateAsync(
+          ThirdInterface entity
+         )
+        {
+            Verify(entity);
+
+            return new ThirdInterface
+            {
+                DisplayName = entity.DisplayName,
+                DisplayOrder = await EntityHelper.CreateMaxDisplayOrder<ThirdInterface>(_thirdInterfaceRepository),
+                IsActive = entity.IsActive,
+                MedicalCenterId = entity.MedicalCenterId,
+                ParmValue = entity.ParmValue,
+                ThirdInterfaceType = entity.ThirdInterfaceType
+            };
+        }
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="sourceEntity"></param>
+        /// <param name="targetEntity"></param>
+        /// <returns></returns>
+        public void UpdateAsync(
+           ThirdInterface sourceEntity,
+           ThirdInterface targetEntity
+          )
+        {
+            DataHelper.CheckEntityIsNull(targetEntity);
+            Verify(sourceEntity);
+            if (sourceEntity.DisplayName != targetEntity.DisplayName)
+            {
+                targetEntity.DisplayName = sourceEntity.DisplayName;
+            }
+
+            targetEntity.IsActive = sourceEntity.IsActive;
+            targetEntity.MedicalCenterId = sourceEntity.MedicalCenterId;
+            targetEntity.ParmValue = sourceEntity.ParmValue;
+            targetEntity.ThirdInterfaceType = sourceEntity.ThirdInterfaceType;
+        }
+
+
+
+
+        /// <summary>
+        /// 删除项目时，同步删除项目结果模板( item_result_template)、参考范围(reference_range)、结果匹配(item_result_match)、组合项目包含的项目(asbitem_detail),项目模板明细（ItemTemplateDetail）。
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        public async Task CheckAndDeleteAsync(Guid id)
+        {
+            await _thirdInterfaceRepository.DeleteAsync(id);
+        }
+
+
+
+        /// <summary>
+        /// 修改排序  置顶，置底
+        /// </summary>
+        /// <param name="id">需要修改的ID</param>
+        /// <param name="SortType">修改方式：1 置顶   2 置底</param>
+        /// <returns></returns>
+        public async Task UpdateManySortAsync(Guid id, int SortType)
+        {
+            await EntityHelper.UpdateManySortAsync(_thirdInterfaceRepository, id, SortType);
+        }
+
+
+
+        /// <summary>
+        /// 修改排序  拖拽
+        /// </summary>
+        /// <typeparam name="TEntity"></typeparam>
+        /// <param name="repository"></param>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task UpdateSortManyAsync(UpdateSortManyDto input)
+        {
+            await EntityHelper.UpdateSortManyAsync(_thirdInterfaceRepository, input);
+
+        }
+
+
+        private void Verify(ThirdInterface entity)
+        {
+            DataHelper.CheckEntityIsNull(entity);
+            DataHelper.CheckStringIsNull(entity.DisplayName, "名称");
+            DataHelper.CheckStringIsNull(entity.ParmValue, "配置参数");
+            DataHelper.CheckCharIsYOrN(entity.IsActive, "是否启用");
+            if (entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.LisRequest
+                && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ChargeRequest)
+            {
+                throw new ArgumentException($"接口类型参数为:{entity.ThirdInterfaceType},是无效值,只能为{ThirdInterfaceTypeFlag.LisRequest}跟{ThirdInterfaceTypeFlag.ChargeRequest}");
+            }
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240429121856_init20240429001.cs

@@ -0,0 +1,22 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240429001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+         
+
+           
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            
+        }
+    }
+}

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

@@ -414,127 +414,6 @@ 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<DateOnly>("BRITHDAY")
-                        .HasColumnType("date")
-                        .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")
@@ -2016,8 +1895,8 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("last_modifier_id");
 
                     b.Property<string>("ParmValue")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
                         .HasColumnName("parm_value");
 
                     b.HasKey("Id");
@@ -7686,6 +7565,10 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("critical_value_process_flag")
                         .HasComment("危急值处理标志");
 
+                    b.Property<Guid?>("ExecOrganizationUnitId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("exec_organization_unit_id");
+
                     b.Property<char>("IsAudit")
                         .HasMaxLength(1)
                         .HasColumnType("character(1)")
@@ -10271,6 +10154,188 @@ namespace Shentun.Peis.Migrations
                     b.HasComment("系统参数可选值设置");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.ThirdInterface", b =>
+                {
+                    b.Property<Guid>("MedicalCenterId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("medical_center_id");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property<Guid?>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)")
+                        .HasColumnName("display_name")
+                        .HasComment("名称");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasComment("显示顺序");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property<char>("IsActive")
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_active")
+                        .HasComment("是否启用");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property<string>("ParmValue")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("parm_value");
+
+                    b.Property<string>("ThirdInterfaceType")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("third_interface_type")
+                        .HasComment("接口类型");
+
+                    b.HasKey("MedicalCenterId");
+
+                    b.ToTable("third_interface");
+
+                    b.HasComment("第三方接口表");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.ThirdLisRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property<string>("AsbitemCodes")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)")
+                        .HasColumnName("asbitem_codes");
+
+                    b.Property<string>("AsbitemNames")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)")
+                        .HasColumnName("asbitem_names");
+
+                    b.Property<string>("ChargeFlag")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("charge_flag");
+
+                    b.Property<string>("ChargeType")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("charge_type");
+
+                    b.Property<decimal>("Charges")
+                        .HasColumnType("numeric(8,2)")
+                        .HasColumnName("charges");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property<Guid?>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property<string>("DepartmentCode")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("department_code");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property<Guid>("LisRequestId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("lis_request_id");
+
+                    b.Property<string>("PatientType")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("patient_type");
+
+                    b.Property<DateTime>("RequestDate")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("request_date");
+
+                    b.Property<string>("RequesterCode")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("requester_code");
+
+                    b.Property<string>("SampleRequestFlag")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("sample_request_flag");
+
+                    b.Property<string>("SampleType")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("sample_type");
+
+                    b.Property<string>("SamplerCode")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("sampler_code");
+
+                    b.Property<string>("Telephone")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("telephone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("third_lis_request");
+
+                    b.HasComment("LIS对接表");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.TitleType", b =>
                 {
                     b.Property<Guid>("Id")
@@ -10647,76 +10712,6 @@ namespace Shentun.Peis.Migrations
                     b.HasComment("角色对应菜单权限");
                 });
 
-            modelBuilder.Entity("Shentun.Peis.ThirdInterfaces.ThirdInterface", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id")
-                        .IsFixedLength()
-                        .HasComment("编号");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasMaxLength(40)
-                        .HasColumnType("character varying(40)")
-                        .HasColumnName("concurrency_stamp");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnType("timestamp without time zone")
-                        .HasColumnName("creation_time");
-
-                    b.Property<Guid?>("CreatorId")
-                        .IsRequired()
-                        .HasColumnType("uuid")
-                        .HasColumnName("creator_id");
-
-                    b.Property<string>("DisplayName")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)")
-                        .HasColumnName("display_name")
-                        .HasComment("名称");
-
-                    b.Property<int>("DisplayOrder")
-                        .HasColumnType("integer")
-                        .HasColumnName("display_order")
-                        .HasComment("显示顺序");
-
-                    b.Property<char>("IsActive")
-                        .HasMaxLength(1)
-                        .HasColumnType("character(1)")
-                        .HasColumnName("is_active")
-                        .HasComment("是否启用");
-
-                    b.Property<DateTime?>("LastModificationTime")
-                        .IsRequired()
-                        .HasColumnType("timestamp without time zone")
-                        .HasColumnName("last_modification_time");
-
-                    b.Property<Guid?>("LastModifierId")
-                        .IsRequired()
-                        .HasColumnType("uuid")
-                        .HasColumnName("last_modifier_id");
-
-                    b.Property<string>("ParmValue")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)")
-                        .HasColumnName("parm_value");
-
-                    b.Property<string>("ThirdInterfaceType")
-                        .IsRequired()
-                        .HasMaxLength(2)
-                        .HasColumnType("character varying(2)")
-                        .HasColumnName("third_interface_type")
-                        .HasComment("接口类型");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("third_interface");
-
-                    b.HasComment("第三方接口表");
-                });
-
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
                 {
                     b.Property<Guid>("Id")