From 13a44fedc3e166f385cb7c37c962954d0d1c31f3 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Tue, 12 Sep 2023 15:03:09 +0800
Subject: [PATCH] xiugai

---
 .../CustomerOrgs/CreateCustomerOrgDto.cs                 | 2 +-
 .../CustomerOrgRegisterAppService.cs                     | 7 ++++---
 .../CustomerOrgs/CustomerOrgAppService.cs                | 9 ++++++---
 .../PatientRegisters/PatientRegisterAppService.cs        | 4 ++--
 .../RegisterAsbitems/RegisterAsbitemAppService.cs        | 4 ++++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/CustomerOrgs/CreateCustomerOrgDto.cs b/src/Shentun.Peis.Application.Contracts/CustomerOrgs/CreateCustomerOrgDto.cs
index fbda536..6c29a22 100644
--- a/src/Shentun.Peis.Application.Contracts/CustomerOrgs/CreateCustomerOrgDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/CustomerOrgs/CreateCustomerOrgDto.cs
@@ -71,7 +71,7 @@ namespace Shentun.Peis.CustomerOrgs
         /// <summary>
         /// 单位性质
         /// </summary>
-        public Guid OrgTypeId { get; set; }
+        public Guid? OrgTypeId { get; set; }
 
  
 
diff --git a/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs b/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs
index 559b7ac..bf192c5 100644
--- a/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs
@@ -195,13 +195,14 @@ namespace Shentun.Peis.CustomerOrgRegisters
         /// </summary>
         /// <param name="CustomerOrgId"></param>
         /// <returns></returns>
+        [HttpGet("api/app/customerorgregister/getlistincustomerorgid")]
         public async Task<List<CustomerOrgRegisterDto>> GetListInCustomerOrgIdAsync(Guid CustomerOrgId)
         {
 
             var entlist = await Repository.GetListAsync();
 
-            if (CustomerOrgId != Guid.Empty)
-                entlist = entlist.Where(m => m.CustomerOrgId == CustomerOrgId).ToList();
+            //if (CustomerOrgId != Guid.Empty)
+            entlist = entlist.Where(m => m.CustomerOrgId == CustomerOrgId).ToList();
 
             var userList = await _userRepository.GetListAsync();
 
@@ -223,7 +224,7 @@ namespace Shentun.Peis.CustomerOrgRegisters
                 CustomerOrgId = s.CustomerOrgId,
                 CreatorName = EntityHelper.GetUserNameNoSql(userList, s.CreatorId),
                 LastModifierName = EntityHelper.GetUserNameNoSql(userList, s.LastModifierId)
-            }).ToList();
+            }).OrderBy(o=>o.MedicalTimes).ToList();
 
             return entdto;
 
diff --git a/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs b/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs
index 8c56dc1..059d894 100644
--- a/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs
+++ b/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs
@@ -126,6 +126,7 @@ namespace Shentun.Peis.CustomerOrgs
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
+        [HttpPost("api/app/customerorg/create")]
         public override async Task<CustomerOrgDto> CreateAsync(CreateCustomerOrgDto input)
         {
             var createEntity = ObjectMapper.Map<CreateCustomerOrgDto, CustomerOrg>(input);
@@ -209,15 +210,16 @@ namespace Shentun.Peis.CustomerOrgs
             if (dataList.Count > 0 && !string.IsNullOrEmpty(Filter))
                 dataList = dataList.Where(m => m.DisplayName.Contains(Filter) || m.ShortName.Contains(Filter)).ToList();
 
-            return dataList;
+            return dataList.OrderBy(o=>o.DisplayOrder).ToList();
         }
 
         /// <summary>
         /// 获取组织树型结构
         /// </summary>
-        /// <param name="IsHidePerson">是否隐藏个人信息  1 隐藏    0隐藏   默认为0</param>
+        /// <param name="IsHidePerson">是否隐藏个人信息  1 隐藏    0不隐藏   默认为0</param>
         /// <param name="Filter">名字搜索，支持模糊查找</param>
         /// <returns></returns>
+        [HttpGet("api/app/customerorg/getbycodeall")]
         public async Task<List<TreeChildViewDto>> GetByCodeAllAsync(string Filter, int IsHidePerson = 0)
         {
             var dataList = await Repository.GetListAsync();
@@ -227,7 +229,8 @@ namespace Shentun.Peis.CustomerOrgs
             {
                 dataList = dataList.Where(m => m.Id != Guid.Empty).ToList();
             }
-            var items = from p in dataList
+
+            var items = from p in dataList.OrderBy(o => o.DisplayOrder)
                         select new TreeChildViewDto()
                         {
                             Id = p.Id,
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index 64fa3b1..88db270 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -603,7 +603,7 @@ namespace Shentun.Peis.PatientRegisters
         /// <returns></returns>
         public override async Task DeleteAsync(Guid id)
         {
-            await _manager.CheckDeleteAsync(id);
+            await _manager.CheckAndDeleteAsync(id);
         }
 
 
@@ -623,7 +623,7 @@ namespace Shentun.Peis.PatientRegisters
                 {
                     foreach (var ent in entlist)
                     {
-                        await _manager.CheckDeleteAsync(ent.Id);
+                        await _manager.CheckAndDeleteAsync(ent.Id);
                     }
                 }
 
diff --git a/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs b/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs
index 0b465b1..8b188d4 100644
--- a/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs
+++ b/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs
@@ -734,5 +734,9 @@ namespace Shentun.Peis.RegisterAsbitems
 
         #endregion
 
+        #region 合并项目、取消合并
+
+        #endregion
+
     }
 }