Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs

@@ -249,6 +249,77 @@ namespace Shentun.Peis.PatientRegisters
         {
             RegisterCheckAsbitems = new List<CreatePatientRegisterRegisterCheckAsbitem>();
         }
+
+     
+
+        #region 人员登记扩展信息
+
+        /// <summary>
+        /// 0-高原  1-健康
+        /// </summary>
+        public char? QztlType { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsCw { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsCy { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsGt { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsMain { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsWh { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsFj { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? IsQztlImport { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? UploadQztlFlag { get; set; } = 'N';
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Planuserid { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark2 { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark3 { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark4 { get; set; }
+
+        #endregion
     }
 
 

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)

src/Shentun.Peis.Application.Contracts/Permissions/PeisPermissions.cs

@@ -78,4 +78,15 @@ public static class PeisPermissions
     {
         public const string Default = "Peis.Third.All";
     }
+
+    /// <summary>
+    /// 基础数据接口统一权限
+    /// </summary>
+    public const string BaseDataGroupName = "Peis.BaseData";
+
+    public static class BaseData
+    {
+        public const string Default = "Peis.BaseData.All";
+    }
+
 }

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<PatientRegisterExter> _patientRegisterExterRepository;
+        private readonly PatientRegisterExterManager _patientRegisterExterManager;
         public PatientRegisterAppService(
             IRepository<PatientRegister, Guid> repository,
             IRepository<Patient, Guid> patientRepository,
@@ -146,7 +148,8 @@ namespace Shentun.Peis.PatientRegisters
             SumSuggestionHeaderManager sumSuggestionHeaderManager,
             SumSuggestionContentManager sumSuggestionContentManager,
             SysParmValueManager sysParmValueManager,
-            IRepository<PatientRegisterExter> patientRegisterExterRepository)
+            IRepository<PatientRegisterExter> patientRegisterExterRepository,
+            PatientRegisterExterManager patientRegisterExterManager)
             : base(repository)
         {
             this._repository = repository;
@@ -193,6 +196,7 @@ namespace Shentun.Peis.PatientRegisters
             _sumSuggestionContentManager = sumSuggestionContentManager;
             _sysParmValueManager = sysParmValueManager;
             _patientRegisterExterRepository = patientRegisterExterRepository;
+            _patientRegisterExterManager = patientRegisterExterManager;
         }
         /// <summary>
         /// 获取通过主键
@@ -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,86 +404,99 @@ 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
 
 
             int totalCount = entlist.Count();
 
-            entlist = entlist.OrderBy(o => o.Id).Skip(input.SkipCount * input.MaxResultCount).Take(input.MaxResultCount);
+            entlist = entlist.OrderBy(o => o.patientRegister.Id).Skip(input.SkipCount * input.MaxResultCount).Take(input.MaxResultCount);
 
 
             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<CreatePatientRegisterDto, CreatePatientRegisterArg>(input);
+            var createPatientRegisterExterArg = ObjectMapper.Map<CreatePatientRegisterDto, CreatePatientRegisterExterArg>(input);
             var updatePatientEntity = ObjectMapper.Map<CreatePatientRegisterDto, Patient>(input);
             var registerAsbitems = ObjectMapper.Map<List<CreatePatientRegisterRegisterCheckAsbitem>, List<RegisterCheckAsbitem>>(input.RegisterCheckAsbitems);
             var updatePatientRegisterArg = ObjectMapper.Map<CreatePatientRegisterDto, UpdatePatientRegisterArg>(input);
+            var updatePatientRegisterExterArg = ObjectMapper.Map<CreatePatientRegisterDto, UpdatePatientRegisterExterArg>(input);
             updatePatientEntity.DisplayName = input.PatientName;
             //创建人员信息
             Patient patient = null;
@@ -792,12 +821,20 @@ 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);
+                entity = await _repository.InsertAsync(entity);
+
+                createPatientRegisterExterArg.PatientRegisterId = entity.Id;
+
+                #region 扩展表
+                patientRegisterExterEntity = _patientRegisterExterManager.CreateAsync(createPatientRegisterExterArg);
+                await _patientRegisterExterRepository.InsertAsync(patientRegisterExterEntity);
+                #endregion
             }
             else
             {
@@ -806,9 +843,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)
             {
@@ -2410,8 +2458,6 @@ namespace Shentun.Peis.PatientRegisters
             var entdto = new PatientRegisterOrNoDto();
             if (ent != null)
             {
-
-
                 entdto = new PatientRegisterOrNoDto
                 {
                     Age = ent.Age,
@@ -2474,11 +2520,10 @@ namespace Shentun.Peis.PatientRegisters
                     PatientPassword = ent.Patient.PatientPassword,
                     PostalCode = ent.Patient.PostalCode,
                     Telephone = ent.Patient.Telephone,
-                    CustomerOrgName = "",
-                    CustomerOrgParentName = ""
-
+                    CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(ent.CustomerOrgId).Result,
+                    CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(ent.CustomerOrgId).Result,
+                    CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(ent.CustomerOrgId).Result.Id,
                 };
-
                 var registerCheckAsbitems = (await _registerCheckAsbitemRepository.GetQueryableAsync())
               .Include(x => x.Asbitem)
               .Include(x => x.Asbitem.ItemType)
@@ -2560,7 +2605,7 @@ namespace Shentun.Peis.PatientRegisters
                     entdto.IsQztlImport = patientRegisterExterEnt.IsQztlImport;
                     entdto.Planuserid = patientRegisterExterEnt.Planuserid;
                 }
-                 
+
                 #endregion
             }
             return entdto;

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<UpdateSexHormoneTermDto, SexHormoneTerm>();
 
 
+        CreateMap<CreatePatientRegisterDto, CreatePatientRegisterExterArg>();
+        CreateMap<CreatePatientRegisterDto, UpdatePatientRegisterExterArg>();
         CreateMap<PatientRegister, PatientRegisterDto>();
         CreateMap<CreatePatientRegisterDto, PatientRegister>()
             .ForMember(d => d.BirthDate, opt => opt.MapFrom(src => PageHelper.ConvertDatetimeV(src.BirthDate)))
@@ -462,6 +465,8 @@ public class PeisApplicationAutoMapperProfile : Profile
         CreateMap<CollectItemType, CollectItemTypeDto>();
         CreateMap<CreateCollectItemTypeDto, CollectItemType>();
         CreateMap<UpdateCollectItemTypeDto, CollectItemType>();
- 
+
+
+        
     }
 }

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}!"
   }
 }

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; }
+
+        /// <summary>
+        /// 0-高原  1-健康
+        /// </summary>
+        public char? QztlType { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsCw { get; set; } 
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsCy { get; set; } 
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsGt { get; set; } 
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsMain { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsWh { get; set; } 
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsFj { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? IsQztlImport { get; set; } 
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? UploadQztlFlag { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Planuserid { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark2 { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark3 { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark4 { get; set; }
+    }
+}

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;
+        }
+
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="sourceEntity">Dto实体映射数据</param>
+        /// <param name="targetEntity">原始数据</param>
+        /// <returns></returns>
+        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;
+
+
+
+        }
+    }
+}

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
+    {
+        /// <summary>
+        /// 0-高原  1-健康
+        /// </summary>
+        public char? QztlType { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsCw { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsCy { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsGt { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsMain { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsWh { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? QztlIsFj { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? IsQztlImport { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public char? UploadQztlFlag { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Planuserid { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark2 { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark3 { get; set; }
+
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string Remark4 { get; set; }
+    }
+}