From a133e76c8b5a3137b13288e0474f46d8c992b40c Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Thu, 9 May 2024 00:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=BC=95=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AsbitemGuides/AsbitemGuideDto.cs | 2 +-
.../AsbitemGuides/CreateAsbitemGuideManyDto.cs | 2 +-
.../AsbitemGuides/AsbitemGuideAppService.cs | 4 ++--
src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuide.cs | 8 ++++----
.../AsbitemGuides/AsbitemGuideManager.cs | 4 ++--
.../DbMapping/AsbitemGuides/AsbitemGuideDbMapping.cs | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Shentun.Peis.Application.Contracts/AsbitemGuides/AsbitemGuideDto.cs b/src/Shentun.Peis.Application.Contracts/AsbitemGuides/AsbitemGuideDto.cs
index c5d45c4..6411e14 100644
--- a/src/Shentun.Peis.Application.Contracts/AsbitemGuides/AsbitemGuideDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/AsbitemGuides/AsbitemGuideDto.cs
@@ -9,7 +9,7 @@ namespace Shentun.Peis.AsbitemGuides
///
/// 单位科室ID
///
- public Guid OrganizationUnitId { get; set; }
+ public Guid MedicalCenterId { get; set; }
///
/// 组合项目ID
diff --git a/src/Shentun.Peis.Application.Contracts/AsbitemGuides/CreateAsbitemGuideManyDto.cs b/src/Shentun.Peis.Application.Contracts/AsbitemGuides/CreateAsbitemGuideManyDto.cs
index 45dcacd..8234c12 100644
--- a/src/Shentun.Peis.Application.Contracts/AsbitemGuides/CreateAsbitemGuideManyDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/AsbitemGuides/CreateAsbitemGuideManyDto.cs
@@ -27,7 +27,7 @@ namespace Shentun.Peis.AsbitemGuides
///
/// 单位科室ID
///
- public Guid OrganizationUnitId { get; set; }
+ public Guid MedicalCenterId { get; set; }
///
/// 适用性别ID
diff --git a/src/Shentun.Peis.Application/AsbitemGuides/AsbitemGuideAppService.cs b/src/Shentun.Peis.Application/AsbitemGuides/AsbitemGuideAppService.cs
index d710dce..a86bd34 100644
--- a/src/Shentun.Peis.Application/AsbitemGuides/AsbitemGuideAppService.cs
+++ b/src/Shentun.Peis.Application/AsbitemGuides/AsbitemGuideAppService.cs
@@ -52,7 +52,7 @@ namespace Shentun.Peis.AsbitemGuides
List asbitemGuides = new List();
foreach (var item in input.Deatils)
{
- if (asbitemGuides.Where(m => m.ForSexId == item.ForSexId && m.OrganizationUnitId == item.OrganizationUnitId).Count() > 0)
+ if (asbitemGuides.Where(m => m.ForSexId == item.ForSexId && m.MedicalCenterId == item.MedicalCenterId).Count() > 0)
throw new UserFriendlyException("同一个体检中心下，不能存在相同适应性别的设置");
var entity = new AsbitemGuide
@@ -60,7 +60,7 @@ namespace Shentun.Peis.AsbitemGuides
AsbitemId = input.AsbitemId,
ForSexId = item.ForSexId,
Guide = item.Guide,
- OrganizationUnitId = item.OrganizationUnitId
+ MedicalCenterId = item.MedicalCenterId
};
asbitemGuides.Add(_manager.CreateAsync(entity));
diff --git a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuide.cs b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuide.cs
index ce5d1e6..cac7ee3 100644
--- a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuide.cs
+++ b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuide.cs
@@ -13,11 +13,11 @@ namespace Shentun.Peis.Models
public class AsbitemGuide : AuditedEntity, IHasConcurrencyStamp
{
///
- /// 单位科室ID
+ /// 体检中心ID
///
[Key]
- [Column("organization_unit_id")]
- public Guid OrganizationUnitId { get; set; }
+ [Column("medical_center_id")]
+ public Guid MedicalCenterId { get; set; }
///
/// 组合项目ID
///
@@ -43,7 +43,7 @@ namespace Shentun.Peis.Models
public override object[] GetKeys()
{
- return new object[] { OrganizationUnitId, AsbitemId, ForSexId };
+ return new object[] { MedicalCenterId, AsbitemId, ForSexId };
}
//[Column("last_modifier_id")]
diff --git a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs
index 9719fb6..38e3b10 100644
--- a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs
+++ b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs
@@ -31,7 +31,7 @@ namespace Shentun.Peis.AsbitemGuides
public AsbitemGuide CreateAsync(AsbitemGuide entity)
{
DataHelper.CheckGuidIsDefaultValue(entity.AsbitemId, "组合项目编号");
- DataHelper.CheckGuidIsDefaultValue(entity.OrganizationUnitId, "体检中心");
+ DataHelper.CheckGuidIsDefaultValue(entity.MedicalCenterId, "体检中心");
if (entity.ForSexId != ForSexFlag.All
&& entity.ForSexId != ForSexFlag.Male
&& entity.ForSexId != ForSexFlag.Female
@@ -72,7 +72,7 @@ namespace Shentun.Peis.AsbitemGuides
public string GetAsbitemGuideConvertSexId(Guid OrOrganizationUnitId, Guid AsbitemId, char SexId)
{
//以体检中心跟组合项目去查
- var entlist = _asbitemGuideRepository.GetListAsync(m => m.OrganizationUnitId == OrOrganizationUnitId && m.AsbitemId == AsbitemId).Result;
+ var entlist = _asbitemGuideRepository.GetListAsync(m => m.MedicalCenterId == OrOrganizationUnitId && m.AsbitemId == AsbitemId).Result;
if (SexFlag.UnKnown == SexId)
{
//判断是否为未知、未知去找适用性别为全部的
diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/AsbitemGuides/AsbitemGuideDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/AsbitemGuides/AsbitemGuideDbMapping.cs
index 890eb55..0211fb6 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/AsbitemGuides/AsbitemGuideDbMapping.cs
+++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/AsbitemGuides/AsbitemGuideDbMapping.cs
@@ -14,11 +14,11 @@ namespace Shentun.Peis.DbMapping
{
public void Configure(EntityTypeBuilder entity)
{
- entity.HasKey(e => new { e.OrganizationUnitId, e.AsbitemId, e.ForSexId })
+ entity.HasKey(e => new { e.MedicalCenterId, e.AsbitemId, e.ForSexId })
.HasName("pk_department_asbitem_guide");
entity.HasComment("体检中心组和项目指引内容");
- entity.Property(t => t.OrganizationUnitId).HasComment("单位科室ID").IsRequired().IsFixedLength();
+ entity.Property(t => t.MedicalCenterId).HasComment("单位科室ID").IsRequired().IsFixedLength();
entity.Property(t => t.AsbitemId).HasComment("组合项目ID").IsRequired().IsFixedLength();
entity.Property(t => t.ForSexId).HasComment("适用性别ID").IsRequired().HasDefaultValueSql("'A'");
entity.Property(t => t.Guide).HasComment("指引单内容");