diff --git a/src/Shentun.Peis.Application.Contracts/AppointPatientRegisters/AppointPatientRegisterDto.cs b/src/Shentun.Peis.Application.Contracts/AppointPatientRegisters/AppointPatientRegisterDto.cs new file mode 100644 index 0000000..a810565 --- /dev/null +++ b/src/Shentun.Peis.Application.Contracts/AppointPatientRegisters/AppointPatientRegisterDto.cs @@ -0,0 +1,118 @@ + +using System; +using System.Collections.Generic; +using System.Text; + +namespace Shentun.Peis.AppointPatientRegisters +{ + /// + /// 预约信息 + /// + public class AppointPatientRegisterDto + { + /// + /// 预约登记ID + /// + public Guid AppointPatientRegisterId { get; set; } + /// + /// 人员ID + /// + + public Guid PersonId { get; set; } + /// + /// 姓名 + /// + + public string PersonName { get; set; } + /// + /// 身份证号 + /// + public string? IdNo { get; set; } + /// + /// 性别ID + /// + public char SexId { get; set; } + /// + /// 性别名称 + /// + public string SexName { get; set; } + /// + /// 婚姻状况ID + /// + public char MaritalStatusId { get; set; } + /// + /// 婚姻状况名称 + /// + public string MaritalStatusName { get; set; } + /// + /// 单位ID + /// + + public Guid CustomerOrgId { get; set; } + /// + /// 单位名称 + /// + public string CustomerOrgName { get; set; } + public string ChildCustomerOrgName { get; set; } + /// + /// 单位分组ID + /// + + public Guid? CustomerOrgGroupId { get; set; } + /// + /// 单位分组名称 + /// + public string CustomerOrgGroupName { get; set; } + /// + /// 套餐ID + /// + + public Guid? MedicalPackageId { get; set; } + /// + /// 套餐名称 + /// + public string MedicalPackageName { get; set; } + /// + /// 完成标志 + /// + + public char CompleteFlag { get; set; } + /// + /// 预约日期 + /// + + public DateTime AppointDate { get; set; } + /// + /// 备注 + /// + + public string? Remark { get; set; } + /// + /// 体检中心ID + /// + + public Guid MedicalCenterId { get; set; } + /// + /// 单位登记ID + /// + + public Guid CustomerOrgRegisterId { get; set; } + /// + /// 备孕标志 + /// + + public char PregnantFlag { get; set; } + public string PregnantFlagName { get; set; } + /// + /// 身高 + /// + public decimal? Height { get; set; } + /// + /// 体重 + /// + + public decimal? Weight { get; set; } + + + } +} diff --git a/src/Shentun.Peis.Application.Contracts/AppointPatientRegisters/AppointPatientRegisterInputDto.cs b/src/Shentun.Peis.Application.Contracts/AppointPatientRegisters/AppointPatientRegisterInputDto.cs new file mode 100644 index 0000000..b6ba123 --- /dev/null +++ b/src/Shentun.Peis.Application.Contracts/AppointPatientRegisters/AppointPatientRegisterInputDto.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Shentun.Peis.AppointPatientRegisters +{ + public class AppointPatientRegisterInputDto + { + public Guid? MedicalCenterId { get; set; } + public string IdNo { get; set; } + public string MobilePhone { get; set; } + + public DateTime? AppointStartDate { get; set; } + public DateTime? AppointStopDate { get; set; } + + } +} diff --git a/src/Shentun.Peis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs b/src/Shentun.Peis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs new file mode 100644 index 0000000..f573e51 --- /dev/null +++ b/src/Shentun.Peis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs @@ -0,0 +1,21 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Shentun.Peis.AppointPatientRegisters +{ + [ApiExplorerSettings(GroupName = "Work")] + [Authorize] + public class AppointPatientRegisterAppService : ApplicationService + { + //public async Task> GetListByIdNoOrMobilePhoneAsync(AppointPatientRegisterInputDto input) + //{ + + //} + } +} diff --git a/src/Shentun.Peis.Domain.Shared/Enums/ThirdInterfaceTypeFlag.cs b/src/Shentun.Peis.Domain.Shared/Enums/ThirdInterfaceTypeFlag.cs index 4b2f8f0..56e7b29 100644 --- a/src/Shentun.Peis.Domain.Shared/Enums/ThirdInterfaceTypeFlag.cs +++ b/src/Shentun.Peis.Domain.Shared/Enums/ThirdInterfaceTypeFlag.cs @@ -26,5 +26,8 @@ namespace Shentun.Peis.Enums [Description("传输数据给WebPeis")] public const string TranToWebPeis = "06"; + + [Description("网上预约查询")] + public const string WebAppoint = "07"; } } diff --git a/src/Shentun.Peis.Domain/ThirdInterfaces/ThirdInterfaceManager.cs b/src/Shentun.Peis.Domain/ThirdInterfaces/ThirdInterfaceManager.cs index 24287b8..8caeb99 100644 --- a/src/Shentun.Peis.Domain/ThirdInterfaces/ThirdInterfaceManager.cs +++ b/src/Shentun.Peis.Domain/ThirdInterfaces/ThirdInterfaceManager.cs @@ -10,6 +10,7 @@ using Volo.Abp.Domain.Repositories; using Volo.Abp; using Volo.Abp.Domain.Services; using Shentun.Peis.HelperDto; +using System.Reflection; namespace Shentun.Peis.ThirdInterfaces { @@ -118,15 +119,25 @@ namespace Shentun.Peis.ThirdInterfaces DataHelper.CheckStringIsNull(entity.DisplayName, "名称"); DataHelper.CheckStringIsNull(entity.ParmValue, "配置参数"); DataHelper.CheckCharIsYOrN(entity.IsActive, "是否启用"); - if (entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.LisRequest - && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ChargeRequest - && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ImportLisResult - && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ImportPacsResult - && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ImportPatientRegister - && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.TranToWebPeis) + + Type type = typeof(ThirdInterfaceTypeFlag); + //从规定的约束内搜索字段 + //约束有是静态成员,是公共成员,和返回父级的公共静态成员, + FieldInfo[] fields = type.GetFields(BindingFlags.Static | BindingFlags.Public | BindingFlags.FlattenHierarchy); + if (fields.Where(o=>o.GetValue(null) == entity.ThirdInterfaceType).Count() == 0) { throw new ArgumentException($"接口类型参数为:{entity.ThirdInterfaceType},是无效值"); } + //if (entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.LisRequest + // && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ChargeRequest + // && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ImportLisResult + // && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ImportPacsResult + // && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.ImportPatientRegister + // && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.TranToWebPeis + // && entity.ThirdInterfaceType != ThirdInterfaceTypeFlag.WebAppoint) + //{ + // throw new ArgumentException($"接口类型参数为:{entity.ThirdInterfaceType},是无效值"); + //} } } }