0826

src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CreateCriticalFollowValueTypeDto.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.CriticalFollowValueTypes
+{
+    public class CreateCriticalFollowValueTypeDto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// 父编号
+        /// </summary>
+        public Guid? ParentId { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CriticalFollowValueTypeDto.cs

@@ -6,22 +6,22 @@ using System.Text;
 
 namespace Shentun.Peis.CriticalFollowValueTypes
 {
-    public class CriticalFollowValueTypeDto:AuditedEntityDtoName
+    public class CriticalFollowValueTypeDto : AuditedEntityDtoName
     {
         /// <summary>
         /// 名称
         /// </summary>
-        public string DisplayName { get; set; } 
+        public string DisplayName { get; set; }
 
         /// <summary>
         /// 父编号
         /// </summary>
-        public Guid ParentId { get; set; }
+        public Guid? ParentId { get; set; }
 
         /// <summary>
         /// 路径编码
         /// </summary>
-        public string PathCode { get; set; } 
+        public string PathCode { get; set; }
 
 
         public int DisplayOrder { get; set; }

src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/UpdateCriticalFollowValueTypeDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.CriticalFollowValueTypes
+{
+    public class UpdateCriticalFollowValueTypeDto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string DisplayName { get; set; }
+    }
+}

src/Shentun.Peis.Application/CriticalFollowValueTypes/CriticalFollowValueTypeAppService.cs

@@ -44,6 +44,21 @@ namespace Shentun.Peis.CriticalFollowValueTypes
             return entDto;
         }
 
+        ///// <summary>
+        ///// 创建
+        ///// </summary>
+        ///// <param name="input"></param>
+        ///// <returns></returns>
+        //public override async Task<CriticalFollowValueTypeDto> CreateAsync(CreateCriticalFollowValueTypeDto input)
+        //{
+        //    var createEntity = ObjectMapper.Map<CreateCriticalFollowValueTypeDto, CriticalFollowValueType>(input);
+        //    var entity = await _manager.CreateAsync(createEntity);
+        //    entity = await Repository.InsertAsync(entity);
+        //    await _manager.UpdateDisplayOrder();  //全局更新
+        //    var dto = ObjectMapper.Map<ItemType, ItemTypeDto>(entity);
+        //    return dto;
+        //}
+
         ///// <summary>
         ///// 更新
         ///// </summary>

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -548,6 +548,7 @@ namespace Shentun.Peis.PatientRegisters
 
             entlist = entlist.OrderByDescending(o => o.patientRegister.CompleteFlag).ThenBy(o => o.patientRegister.Id).Skip(input.SkipCount * input.MaxResultCount).Take(input.MaxResultCount);
 
+            var ggg = entlist.Select(s => s.patientRegister.CustomerOrgId).ToList();
 
             var entdto = entlist.Select(s => new PatientRegisterOrNoDto
             {
@@ -627,9 +628,9 @@ namespace Shentun.Peis.PatientRegisters
                 //CustomerOrgName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId),
                 //CustomerOrgParentId = EntityHelper.GetParentNoSql(customerOrgList, s.patientRegister.CustomerOrgId),
                 //CustomerOrgParentName = EntityHelper.GetCustomerOrgParentNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId)
-                CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(s.patientRegister.CustomerOrgId).Result,
-                CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(s.patientRegister.CustomerOrgId).Result.Id,
-                CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(s.patientRegister.CustomerOrgId).Result
+                CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(s.patientRegister.CustomerOrgId).GetAwaiter().GetResult(),
+                CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(s.patientRegister.CustomerOrgId).GetAwaiter().GetResult().Id,
+                CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(s.patientRegister.CustomerOrgId).GetAwaiter().GetResult()
             }).ToList();
 
 

src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs

@@ -32,7 +32,7 @@ namespace Shentun.Peis.Models
         /// </summary>
         [Column("parent_id")]
         
-        public Guid ParentId { get; set; } 
+        public Guid? ParentId { get; set; } 
         /// <summary>
         /// 路径编码
         /// </summary>

src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs

@@ -16,7 +16,7 @@ namespace Shentun.Peis.DbMapping
         {
             entity.HasComment("危急值类别");
             entity.Property(t => t.DisplayName).HasComment("名称").IsRequired();
-            entity.Property(t => t.ParentId).HasComment("父编号").IsFixedLength();
+            entity.Property(t => t.ParentId).HasComment("父编号");
             entity.Property(t => t.PathCode).HasComment("路径编码").IsRequired();
 
             entity.Property(e => e.Id).IsFixedLength();

src/Shentun.Peis.HttpApi.Host/appsettings.json

@@ -53,10 +53,5 @@
   },
   "Hangfire": {
     "IsEnabledDashboard": true
-  },
-  "Sms": {
-    "IsEnable": "Y", //是否启用上传报告推送短信
-    "NoticeTemplateId": "2238651", //推送短信模板ID
-    "BaseUrl": ""
   }
 }