diff --git a/src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CreateCriticalFollowValueTypeDto.cs b/src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CreateCriticalFollowValueTypeDto.cs
new file mode 100644
index 0000000..49e8753
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 名称
+ ///
+ public string DisplayName { get; set; }
+
+ ///
+ /// 父编号
+ ///
+ public Guid? ParentId { get; set; }
+ }
+}
diff --git a/src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CriticalFollowValueTypeDto.cs b/src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CriticalFollowValueTypeDto.cs
index e12cd2b..5d69942 100644
--- a/src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CriticalFollowValueTypeDto.cs
+++ b/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
{
///
/// 名称
///
- public string DisplayName { get; set; }
+ public string DisplayName { get; set; }
///
/// 父编号
///
- public Guid ParentId { get; set; }
+ public Guid? ParentId { get; set; }
///
/// 路径编码
///
- public string PathCode { get; set; }
+ public string PathCode { get; set; }
public int DisplayOrder { get; set; }
diff --git a/src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/UpdateCriticalFollowValueTypeDto.cs b/src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/UpdateCriticalFollowValueTypeDto.cs
new file mode 100644
index 0000000..144b337
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 名称
+ ///
+ public string DisplayName { get; set; }
+ }
+}
diff --git a/src/Shentun.Peis.Application/CriticalFollowValueTypes/CriticalFollowValueTypeAppService.cs b/src/Shentun.Peis.Application/CriticalFollowValueTypes/CriticalFollowValueTypeAppService.cs
index 77f7497..920747e 100644
--- a/src/Shentun.Peis.Application/CriticalFollowValueTypes/CriticalFollowValueTypeAppService.cs
+++ b/src/Shentun.Peis.Application/CriticalFollowValueTypes/CriticalFollowValueTypeAppService.cs
@@ -44,6 +44,21 @@ namespace Shentun.Peis.CriticalFollowValueTypes
return entDto;
}
+ /////
+ ///// 创建
+ /////
+ /////
+ /////
+ //public override async Task CreateAsync(CreateCriticalFollowValueTypeDto input)
+ //{
+ // var createEntity = ObjectMapper.Map(input);
+ // var entity = await _manager.CreateAsync(createEntity);
+ // entity = await Repository.InsertAsync(entity);
+ // await _manager.UpdateDisplayOrder(); //全局更新
+ // var dto = ObjectMapper.Map(entity);
+ // return dto;
+ //}
+
/////
///// 更新
/////
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index a06a4f9..f44986b 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/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();
diff --git a/src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs b/src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs
index 22ca5e7..bfe9481 100644
--- a/src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs
+++ b/src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs
@@ -32,7 +32,7 @@ namespace Shentun.Peis.Models
///
[Column("parent_id")]
- public Guid ParentId { get; set; }
+ public Guid? ParentId { get; set; }
///
/// 路径编码
///
diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs
index 2513e1b..5e867ef 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/CriticalFollowValueTypes/CriticalFollowValueTypeDbMapping.cs
+++ b/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();
diff --git a/src/Shentun.Peis.HttpApi.Host/appsettings.json b/src/Shentun.Peis.HttpApi.Host/appsettings.json
index f20a2c2..9dcd4fc 100644
--- a/src/Shentun.Peis.HttpApi.Host/appsettings.json
+++ b/src/Shentun.Peis.HttpApi.Host/appsettings.json
@@ -53,10 +53,5 @@
},
"Hangfire": {
"IsEnabledDashboard": true
- },
- "Sms": {
- "IsEnable": "Y", //是否启用上传报告推送短信
- "NoticeTemplateId": "2238651", //推送短信模板ID
- "BaseUrl": ""
}
}
\ No newline at end of file