From a8752a7c01ff1e4b33e3711295b3344146685ab0 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Sun, 5 May 2024 16:06:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E8=B7=9F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=A9=E5=B1=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatePatientRegisterDto.cs | 71 ++++++ .../PeisPermissionDefinitionProvider.cs | 6 + .../Permissions/PeisPermissions.cs | 11 + .../PatientRegisterAppService.cs | 204 +++++++++++------- .../PeisApplicationAutoMapperProfile.cs | 7 +- .../Localization/Peis/en.json | 2 + .../CreatePatientRegisterExterArg.cs | 78 +++++++ .../PatientRegisterExterManager.cs | 85 ++++++++ .../UpdatePatientRegisterExterArg.cs | 76 +++++++ 9 files changed, 460 insertions(+), 80 deletions(-) create mode 100644 src/Shentun.Peis.Domain/PatientRegisterExters/CreatePatientRegisterExterArg.cs create mode 100644 src/Shentun.Peis.Domain/PatientRegisterExters/PatientRegisterExterManager.cs create mode 100644 src/Shentun.Peis.Domain/PatientRegisterExters/UpdatePatientRegisterExterArg.cs diff --git a/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs b/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs index e716442..11a65fe 100644 --- a/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs @@ -249,6 +249,77 @@ namespace Shentun.Peis.PatientRegisters { RegisterCheckAsbitems = new List(); } + + + + #region 人员登记扩展信息 + + /// + /// 0-高原 1-健康 + /// + public char? QztlType { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsCw { get; set; } = 'N'; + + /// + /// 扩展 + /// + public char? QztlIsCy { get; set; } = 'N'; + + /// + /// 扩展 + /// + public char? QztlIsGt { get; set; } = 'N'; + + /// + /// 扩展 + /// + public char? QztlIsMain { get; set; } = 'N'; + + /// + /// 扩展 + /// + public char? QztlIsWh { get; set; } = 'N'; + + /// + /// 扩展 + /// + public char? QztlIsFj { get; set; } = 'N'; + + /// + /// 扩展 + /// + public char? IsQztlImport { get; set; } = 'N'; + + /// + /// 扩展 + /// + public char? UploadQztlFlag { get; set; } = 'N'; + + /// + /// 扩展 + /// + public string Planuserid { get; set; } + + /// + /// 扩展 + /// + public string Remark2 { get; set; } + + /// + /// 扩展 + /// + public string Remark3 { get; set; } + + /// + /// 扩展 + /// + public string Remark4 { get; set; } + + #endregion } diff --git a/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissionDefinitionProvider.cs b/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissionDefinitionProvider.cs index dbc37ae..4738879 100644 --- a/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissionDefinitionProvider.cs +++ b/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissionDefinitionProvider.cs @@ -63,6 +63,12 @@ public class PeisPermissionDefinitionProvider : PermissionDefinitionProvider myThirdGroupName.AddPermission(PeisPermissions.Third.Default, L("Permission:Third")); #endregion + + + #region 基础数据接口权限 + var myBaseDataGroupName = context.AddGroup(PeisPermissions.BaseDataGroupName, L("Peis:BaseData")); + myBaseDataGroupName.AddPermission(PeisPermissions.BaseData.Default, L("Permission:BaseData")); + #endregion } private static LocalizableString L(string name) diff --git a/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissions.cs b/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissions.cs index 618b492..f7486b6 100644 --- a/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissions.cs +++ b/src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissions.cs @@ -78,4 +78,15 @@ public static class PeisPermissions { public const string Default = "Peis.Third.All"; } + + /// + /// 基础数据接口统一权限 + /// + public const string BaseDataGroupName = "Peis.BaseData"; + + public static class BaseData + { + public const string Default = "Peis.BaseData.All"; + } + } diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index 39ca6a6..53bd453 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -13,6 +13,7 @@ using Shentun.Peis.CustomerOrgRegisters; using Shentun.Peis.CustomerOrgs; using Shentun.Peis.Enums; using Shentun.Peis.Models; +using Shentun.Peis.PatientRegisterExters; using Shentun.Peis.Patients; using Shentun.Peis.PeisReports; using Shentun.Peis.RegisterAsbitems; @@ -102,6 +103,7 @@ namespace Shentun.Peis.PatientRegisters private readonly CacheService _cacheService; private readonly SysParmValueManager _sysParmValueManager; private readonly IRepository _patientRegisterExterRepository; + private readonly PatientRegisterExterManager _patientRegisterExterManager; public PatientRegisterAppService( IRepository repository, IRepository patientRepository, @@ -146,7 +148,8 @@ namespace Shentun.Peis.PatientRegisters SumSuggestionHeaderManager sumSuggestionHeaderManager, SumSuggestionContentManager sumSuggestionContentManager, SysParmValueManager sysParmValueManager, - IRepository patientRegisterExterRepository) + IRepository patientRegisterExterRepository, + PatientRegisterExterManager patientRegisterExterManager) : base(repository) { this._repository = repository; @@ -193,6 +196,7 @@ namespace Shentun.Peis.PatientRegisters _sumSuggestionContentManager = sumSuggestionContentManager; _sysParmValueManager = sysParmValueManager; _patientRegisterExterRepository = patientRegisterExterRepository; + _patientRegisterExterManager = patientRegisterExterManager; } /// /// 获取通过主键 @@ -342,37 +346,47 @@ namespace Shentun.Peis.PatientRegisters //stopwatch.Start(); #region MyRegion - var entlist = (await _repository.GetQueryableAsync()).Include(x => x.Patient).AsQueryable(); + //var entlist = (await _repository.GetQueryableAsync()).Include(x => x.Patient).AsQueryable(); + var entlist = from patientRegister in (await _repository.GetQueryableAsync()).Include(x => x.Patient).AsQueryable() + join patientRegisterExter in await _patientRegisterExterRepository.GetQueryableAsync() + on patientRegister.Id equals patientRegisterExter.PatientRegisterId into patientRegisterExterTemp + from patientRegisterExterHaveEmpty in patientRegisterExterTemp.DefaultIfEmpty() + select new + { + patientRegister, + patientRegisterExterHaveEmpty + }; + if (!string.IsNullOrEmpty(input.PatientNo)) - entlist = entlist.Where(m => m.Patient.PatientNo == input.PatientNo); + entlist = entlist.Where(m => m.patientRegister.Patient.PatientNo == input.PatientNo); if (!string.IsNullOrEmpty(input.IdNo)) - entlist = entlist.Where(m => m.Patient.IdNo == input.IdNo); + entlist = entlist.Where(m => m.patientRegister.Patient.IdNo == input.IdNo); if (!string.IsNullOrEmpty(input.PatientName)) - entlist = entlist.Where(m => !string.IsNullOrEmpty(m.PatientName) && m.PatientName.Contains(input.PatientName)); + entlist = entlist.Where(m => !string.IsNullOrEmpty(m.patientRegister.PatientName) && m.patientRegister.PatientName.Contains(input.PatientName)); if (!string.IsNullOrEmpty(input.PatientRegisterNo)) - entlist = entlist.Where(m => m.PatientRegisterNo == input.PatientRegisterNo); + entlist = entlist.Where(m => m.patientRegister.PatientRegisterNo == input.PatientRegisterNo); if (!string.IsNullOrEmpty(input.Phone)) - entlist = entlist.Where(m => m.Patient.MobileTelephone == input.Phone || m.Patient.Telephone == input.Phone); + entlist = entlist.Where(m => m.patientRegister.Patient.MobileTelephone == input.Phone || m.patientRegister.Patient.Telephone == input.Phone); if (input.SexId != null && input.SexId != ForSexFlag.All) - entlist = entlist.Where(m => m.SexId == input.SexId); + entlist = entlist.Where(m => m.patientRegister.SexId == input.SexId); if (!string.IsNullOrEmpty(input.StartDate) && !string.IsNullOrEmpty(input.EndDate)) - entlist = entlist.Where(m => m.CreationTime >= Convert.ToDateTime(input.StartDate) && - m.CreationTime < Convert.ToDateTime(input.EndDate).AddDays(1)); + entlist = entlist.Where(m => m.patientRegister.CreationTime >= Convert.ToDateTime(input.StartDate) && + m.patientRegister.CreationTime < Convert.ToDateTime(input.EndDate).AddDays(1)); if (input.CompleteFlag != null) { - entlist = entlist.Where(m => m.CompleteFlag == input.CompleteFlag); + entlist = entlist.Where(m => m.patientRegister.CompleteFlag == input.CompleteFlag); if (input.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration && input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y') { //直接过滤 - entlist = entlist.Where(m => m.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration); + entlist = entlist.Where(m => m.patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration); } } @@ -381,7 +395,7 @@ namespace Shentun.Peis.PatientRegisters if (input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y') { //直接过滤 - entlist = entlist.Where(m => m.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration); + entlist = entlist.Where(m => m.patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration); } } @@ -390,12 +404,12 @@ namespace Shentun.Peis.PatientRegisters if (input.CustomerOrgId != null) { var CustomerOrgIds = await _customerOrgManager.GetCustomerOrgChildrenId(input.CustomerOrgId.Value); - entlist = entlist.Where(m => CustomerOrgIds.Contains(m.CustomerOrgId)); + entlist = entlist.Where(m => CustomerOrgIds.Contains(m.patientRegister.CustomerOrgId)); } if (input.CustomerOrgRegisterId != null && input.CustomerOrgRegisterId != Guid.Empty) { - entlist = entlist.Where(m => m.CustomerOrgRegisterId == input.CustomerOrgRegisterId); + entlist = entlist.Where(m => m.patientRegister.CustomerOrgRegisterId == input.CustomerOrgRegisterId); } #endregion @@ -407,69 +421,82 @@ namespace Shentun.Peis.PatientRegisters var entdto = entlist.Select(s => new PatientRegisterOrNoDto { - CreationTime = s.CreationTime, - CreatorId = s.CreatorId, - Id = s.Id, - LastModificationTime = s.LastModificationTime, - LastModifierId = s.LastModifierId, - ThirdInfo = s.ThirdInfo, - SummaryDoctorId = s.SummaryDoctorId, - SummaryDate = DataHelper.ConversionDateToString(s.SummaryDate), - SexId = s.SexId, - Age = s.Age, - AuditDate = DataHelper.ConversionDateToString(s.AuditDate), - AuditDoctorId = s.AuditDoctorId, - BirthDate = DataHelper.ConversionDateToString(s.BirthDate), - CompleteFlag = s.CompleteFlag, - CustomerOrgGroupId = s.CustomerOrgGroupId, - CustomerOrgId = s.CustomerOrgId, - CustomerOrgRegisterId = s.CustomerOrgRegisterId, - GuidePrintTimes = s.GuidePrintTimes, - InterposeMeasure = s.InterposeMeasure, - IsAudit = s.IsAudit, - IsLock = s.IsLock, - IsMedicalStart = s.IsMedicalStart, - IsNameHide = s.IsNameHide, - IsPhoneFollow = s.IsPhoneFollow, - IsRecoverGuide = s.IsRecoverGuide, - IsUpload = s.IsUpload, - IsVip = s.IsVip, - JobCardNo = s.JobCardNo, - JobPost = s.JobPost, - JobTitle = s.JobTitle, - MaritalStatusId = s.MaritalStatusId, - MedicalCardNo = s.MedicalCardNo, - MedicalConclusionId = s.MedicalConclusionId, - MedicalPackageId = s.MedicalPackageId, - MedicalStartDate = DataHelper.ConversionDateToString(s.MedicalStartDate), - MedicalTimes = s.MedicalTimes, - MedicalTypeId = s.MedicalTypeId, - MedicalCenterId = s.MedicalCenterId, - PatientId = s.PatientId, - PatientName = s.PatientName, - PatientRegisterNo = s.PatientRegisterNo, - PersonnelTypeId = s.PersonnelTypeId, - Photo = s.Photo, - Remark = s.Remark, - ReportPrintTimes = s.ReportPrintTimes, - Salesman = s.Salesman, - SexHormoneTermId = s.SexHormoneTermId, - CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).Result, - LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).Result, - Address = s.Patient.Address, //档案表信息 - BirthPlaceId = s.Patient.BirthPlaceId, - DisplayName = s.Patient.DisplayName, - Email = s.Patient.Email, - IdNo = s.Patient.IdNo, - MobileTelephone = s.Patient.MobileTelephone, - NationId = s.Patient.NationId, - PatientNo = s.Patient.PatientNo, - PatientPassword = s.Patient.PatientPassword, - PostalCode = s.Patient.PostalCode, - Telephone = s.Patient.Telephone, - CustomerOrgName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.CustomerOrgId), - CustomerOrgParentId = EntityHelper.GetParentNoSql(customerOrgList, s.CustomerOrgId), - CustomerOrgParentName = EntityHelper.GetCustomerOrgParentNameNoSql(customerOrgList, s.CustomerOrgId) + CreationTime = s.patientRegister.CreationTime, + CreatorId = s.patientRegister.CreatorId, + Id = s.patientRegister.Id, + LastModificationTime = s.patientRegister.LastModificationTime, + LastModifierId = s.patientRegister.LastModifierId, + ThirdInfo = s.patientRegister.ThirdInfo, + SummaryDoctorId = s.patientRegister.SummaryDoctorId, + SummaryDate = DataHelper.ConversionDateToString(s.patientRegister.SummaryDate), + SexId = s.patientRegister.SexId, + Age = s.patientRegister.Age, + AuditDate = DataHelper.ConversionDateToString(s.patientRegister.AuditDate), + AuditDoctorId = s.patientRegister.AuditDoctorId, + BirthDate = DataHelper.ConversionDateToString(s.patientRegister.BirthDate), + CompleteFlag = s.patientRegister.CompleteFlag, + CustomerOrgGroupId = s.patientRegister.CustomerOrgGroupId, + CustomerOrgId = s.patientRegister.CustomerOrgId, + CustomerOrgRegisterId = s.patientRegister.CustomerOrgRegisterId, + GuidePrintTimes = s.patientRegister.GuidePrintTimes, + InterposeMeasure = s.patientRegister.InterposeMeasure, + IsAudit = s.patientRegister.IsAudit, + IsLock = s.patientRegister.IsLock, + IsMedicalStart = s.patientRegister.IsMedicalStart, + IsNameHide = s.patientRegister.IsNameHide, + IsPhoneFollow = s.patientRegister.IsPhoneFollow, + IsRecoverGuide = s.patientRegister.IsRecoverGuide, + IsUpload = s.patientRegister.IsUpload, + IsVip = s.patientRegister.IsVip, + JobCardNo = s.patientRegister.JobCardNo, + JobPost = s.patientRegister.JobPost, + JobTitle = s.patientRegister.JobTitle, + MaritalStatusId = s.patientRegister.MaritalStatusId, + MedicalCardNo = s.patientRegister.MedicalCardNo, + MedicalConclusionId = s.patientRegister.MedicalConclusionId, + MedicalPackageId = s.patientRegister.MedicalPackageId, + MedicalStartDate = DataHelper.ConversionDateToString(s.patientRegister.MedicalStartDate), + MedicalTimes = s.patientRegister.MedicalTimes, + MedicalTypeId = s.patientRegister.MedicalTypeId, + MedicalCenterId = s.patientRegister.MedicalCenterId, + PatientId = s.patientRegister.PatientId, + PatientName = s.patientRegister.PatientName, + PatientRegisterNo = s.patientRegister.PatientRegisterNo, + PersonnelTypeId = s.patientRegister.PersonnelTypeId, + Photo = s.patientRegister.Photo, + Remark = s.patientRegister.Remark, + ReportPrintTimes = s.patientRegister.ReportPrintTimes, + Salesman = s.patientRegister.Salesman, + SexHormoneTermId = s.patientRegister.SexHormoneTermId, + CreatorName = _cacheService.GetSurnameAsync(s.patientRegister.CreatorId).Result, + LastModifierName = _cacheService.GetSurnameAsync(s.patientRegister.LastModifierId).Result, + Address = s.patientRegister.Patient.Address, //档案表信息 + BirthPlaceId = s.patientRegister.Patient.BirthPlaceId, + DisplayName = s.patientRegister.Patient.DisplayName, + Email = s.patientRegister.Patient.Email, + IdNo = s.patientRegister.Patient.IdNo, + MobileTelephone = s.patientRegister.Patient.MobileTelephone, + NationId = s.patientRegister.Patient.NationId, + PatientNo = s.patientRegister.Patient.PatientNo, + PatientPassword = s.patientRegister.Patient.PatientPassword, + PostalCode = s.patientRegister.Patient.PostalCode, + Telephone = s.patientRegister.Patient.Telephone, + Planuserid = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.Planuserid : "", + QztlIsCw = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.QztlIsCw : null, + QztlIsCy = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.QztlIsCy : null, + QztlIsFj = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.QztlIsFj : null, + QztlIsGt = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.QztlIsGt : null, + QztlIsMain = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.QztlIsMain : null, + QztlIsWh = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.QztlIsWh : null, + QztlType = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.QztlType : null, + IsQztlImport = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.IsQztlImport : null, + Remark2 = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.Remark2 : null, + Remark3 = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.Remark3 : null, + Remark4 = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.Remark4 : null, + UploadQztlFlag = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.UploadQztlFlag : null, + CustomerOrgName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId), + CustomerOrgParentId = EntityHelper.GetParentNoSql(customerOrgList, s.patientRegister.CustomerOrgId), + CustomerOrgParentName = EntityHelper.GetCustomerOrgParentNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId) }).ToList(); @@ -773,9 +800,11 @@ namespace Shentun.Peis.PatientRegisters }); var createPatientRegisterArg = ObjectMapper.Map(input); + var createPatientRegisterExterArg = ObjectMapper.Map(input); var updatePatientEntity = ObjectMapper.Map(input); var registerAsbitems = ObjectMapper.Map, List>(input.RegisterCheckAsbitems); var updatePatientRegisterArg = ObjectMapper.Map(input); + var updatePatientRegisterExterArg = ObjectMapper.Map(input); updatePatientEntity.DisplayName = input.PatientName; //创建人员信息 Patient patient = null; @@ -792,12 +821,18 @@ namespace Shentun.Peis.PatientRegisters //创建人员登记信息 createPatientRegisterArg.PatientId = patient.Id; PatientRegister entity = null; + PatientRegisterExter patientRegisterExterEntity = null; CreateRegisterCheckAsbitemEntity createRegisterCheckAsbitemEntity = null; if (input.PatientRegisterId == null || input.PatientRegisterId == Guid.Empty) { entity = await _manager.CreateAsync(createPatientRegisterArg); createRegisterCheckAsbitemEntity = await _registerAsbitemManager.UpdateManyAsync(entity, registerAsbitems); await _repository.InsertAsync(entity); + + #region 扩展表 + patientRegisterExterEntity = _patientRegisterExterManager.CreateAsync(createPatientRegisterExterArg); + await _patientRegisterExterRepository.InsertAsync(patientRegisterExterEntity); + #endregion } else { @@ -806,9 +841,20 @@ namespace Shentun.Peis.PatientRegisters createRegisterCheckAsbitemEntity = await _registerAsbitemManager.UpdateManyAsync(entity, registerAsbitems); await _repository.UpdateAsync(entity); + + #region 扩展表 + patientRegisterExterEntity = await _patientRegisterExterRepository.FirstOrDefaultAsync(m => m.PatientRegisterId == entity.Id); + if (patientRegisterExterEntity != null) + { + _patientRegisterExterManager.UpdateAsync(updatePatientRegisterExterArg, patientRegisterExterEntity); + await _patientRegisterExterRepository.UpdateAsync(patientRegisterExterEntity); + } + #endregion } + + //throw new Exception("后续不更新"); if (createRegisterCheckAsbitemEntity != null) { @@ -2560,7 +2606,7 @@ namespace Shentun.Peis.PatientRegisters entdto.IsQztlImport = patientRegisterExterEnt.IsQztlImport; entdto.Planuserid = patientRegisterExterEnt.Planuserid; } - + #endregion } return entdto; diff --git a/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs b/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs index 768d9f3..bbf2eab 100644 --- a/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs +++ b/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs @@ -43,6 +43,7 @@ using Shentun.Peis.MenuInfos; using Shentun.Peis.Models; using Shentun.Peis.Nations; using Shentun.Peis.OrganizationUnits; +using Shentun.Peis.PatientRegisterExters; using Shentun.Peis.PatientRegisters; using Shentun.Peis.Patients; using Shentun.Peis.PayModes; @@ -344,6 +345,8 @@ public class PeisApplicationAutoMapperProfile : Profile CreateMap(); + CreateMap(); + CreateMap(); CreateMap(); CreateMap() .ForMember(d => d.BirthDate, opt => opt.MapFrom(src => PageHelper.ConvertDatetimeV(src.BirthDate))) @@ -462,6 +465,8 @@ public class PeisApplicationAutoMapperProfile : Profile CreateMap(); CreateMap(); CreateMap(); - + + + } } diff --git a/src/Shentun.Peis.Domain.Shared/Localization/Peis/en.json b/src/Shentun.Peis.Domain.Shared/Localization/Peis/en.json index d5095d8..5dc036a 100644 --- a/src/Shentun.Peis.Domain.Shared/Localization/Peis/en.json +++ b/src/Shentun.Peis.Domain.Shared/Localization/Peis/en.json @@ -11,6 +11,8 @@ "Permission:Books.Delete": "Deleting the books", "Permission:Third": "第三方接口基础权限", "Peis:Third": "第三方接口", + "Permission:BaseData": "基础数据接口权限", + "Peis:BaseData": "基础数据接口", "EntityNotFoundErrorMessage": "There is no entity {0} with id = {1}!" } } diff --git a/src/Shentun.Peis.Domain/PatientRegisterExters/CreatePatientRegisterExterArg.cs b/src/Shentun.Peis.Domain/PatientRegisterExters/CreatePatientRegisterExterArg.cs new file mode 100644 index 0000000..1f5d81a --- /dev/null +++ b/src/Shentun.Peis.Domain/PatientRegisterExters/CreatePatientRegisterExterArg.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shentun.Peis.Models +{ + public class CreatePatientRegisterExterArg + { + public Guid PatientRegisterId { get; set; } + + /// + /// 0-高原 1-健康 + /// + public char? QztlType { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsCw { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsCy { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsGt { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsMain { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsWh { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsFj { get; set; } + + /// + /// 扩展 + /// + public char? IsQztlImport { get; set; } + + /// + /// 扩展 + /// + public char? UploadQztlFlag { get; set; } + + /// + /// 扩展 + /// + public string Planuserid { get; set; } + + /// + /// 扩展 + /// + public string Remark2 { get; set; } + + /// + /// 扩展 + /// + public string Remark3 { get; set; } + + /// + /// 扩展 + /// + public string Remark4 { get; set; } + } +} diff --git a/src/Shentun.Peis.Domain/PatientRegisterExters/PatientRegisterExterManager.cs b/src/Shentun.Peis.Domain/PatientRegisterExters/PatientRegisterExterManager.cs new file mode 100644 index 0000000..3ea7cb3 --- /dev/null +++ b/src/Shentun.Peis.Domain/PatientRegisterExters/PatientRegisterExterManager.cs @@ -0,0 +1,85 @@ +using Shentun.Peis.CustomerOrgs; +using Shentun.Peis.Enums; +using Shentun.Peis.Models; +using Shentun.Peis.OrganizationUnits; +using Shentun.Peis.PatientRegisters; +using Shentun.Utilities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Services; +using Volo.Abp.Guids; + +namespace Shentun.Peis.PatientRegisterExters +{ + public class PatientRegisterExterManager : DomainService + { + public PatientRegisterExterManager() { } + + public PatientRegisterExter CreateAsync(CreatePatientRegisterExterArg entity) + { + + DataHelper.CheckEntityIsNull(entity); + if (entity.PatientRegisterId == Guid.Empty) + throw new UserFriendlyException("PatientRegisterId不能为空"); + + var patientRegisterExterEnt = new PatientRegisterExter() + { + PatientRegisterId = entity.PatientRegisterId, + IsQztlImport = entity.IsQztlImport, + Planuserid = entity.Planuserid, + QztlIsCw = entity.QztlIsCw, + QztlIsCy = entity.QztlIsCy, + QztlIsFj = entity.QztlIsFj, + QztlIsGt = entity.QztlIsGt, + QztlIsMain = entity.QztlIsMain, + QztlIsWh = entity.QztlIsWh, + QztlType = entity.QztlType, + Remark2 = entity.Remark2, + Remark3 = entity.Remark3, + Remark4 = entity.Remark4, + UploadQztlFlag = entity.UploadQztlFlag + }; + + + return patientRegisterExterEnt; + } + + /// + /// 更新 + /// + /// Dto实体映射数据 + /// 原始数据 + /// + public void UpdateAsync( + UpdatePatientRegisterExterArg sourceEntity, + PatientRegisterExter targetEntity + ) + { + DataHelper.CheckEntityIsNull(sourceEntity); + DataHelper.CheckEntityIsNull(targetEntity); + + + targetEntity.IsQztlImport = sourceEntity.IsQztlImport; + targetEntity.Planuserid = sourceEntity.Planuserid; + targetEntity.QztlIsCw = sourceEntity.QztlIsCw; + targetEntity.QztlIsCy = sourceEntity.QztlIsCy; + targetEntity.QztlIsFj = sourceEntity.QztlIsFj; + targetEntity.QztlIsGt = sourceEntity.QztlIsGt; + targetEntity.QztlIsMain = sourceEntity.QztlIsMain; + targetEntity.QztlIsWh = sourceEntity.QztlIsWh; + targetEntity.QztlType = sourceEntity.QztlType; + targetEntity.Remark2 = sourceEntity.Remark2; + targetEntity.Remark3 = sourceEntity.Remark3; + targetEntity.Remark4 = sourceEntity.Remark4; + targetEntity.UploadQztlFlag = sourceEntity.UploadQztlFlag; + + + + } + } +} diff --git a/src/Shentun.Peis.Domain/PatientRegisterExters/UpdatePatientRegisterExterArg.cs b/src/Shentun.Peis.Domain/PatientRegisterExters/UpdatePatientRegisterExterArg.cs new file mode 100644 index 0000000..c615208 --- /dev/null +++ b/src/Shentun.Peis.Domain/PatientRegisterExters/UpdatePatientRegisterExterArg.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shentun.Peis.PatientRegisterExters +{ + public class UpdatePatientRegisterExterArg + { + /// + /// 0-高原 1-健康 + /// + public char? QztlType { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsCw { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsCy { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsGt { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsMain { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsWh { get; set; } + + /// + /// 扩展 + /// + public char? QztlIsFj { get; set; } + + /// + /// 扩展 + /// + public char? IsQztlImport { get; set; } + + /// + /// 扩展 + /// + public char? UploadQztlFlag { get; set; } + + /// + /// 扩展 + /// + public string Planuserid { get; set; } + + /// + /// 扩展 + /// + public string Remark2 { get; set; } + + /// + /// 扩展 + /// + public string Remark3 { get; set; } + + /// + /// 扩展 + /// + public string Remark4 { get; set; } + } +}