diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index 589871ba..bf2269cc 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -9,7 +9,33 @@ using System.Collections.Generic;
namespace IRaCIS.Core.Application.ViewModel
{
+ public class CriterionNidusView
+ {
+ public Guid? Id { get; set; }
+ public Guid CriterionId { get; set; }
+ public string NidusType { get; set; }
+ public string NidusTypeCN { get; set; }
+ public DateTime CreateTime { get; set; }
+ public Guid CreateUserId { get; set; }
+ }
+ ///CriterionNidusQuery 列表查询参数模型
+ public class CriterionNidusQuery
+ {
+
+ public Guid CriterionId { get; set; }
+ }
+
+ /// CriterionNidusAddOrEdit 列表查询参数模型
+ public class CriterionNidusAddOrEdit
+ {
+ public Guid Id { get; set; }
+ public Guid CriterionId { get; set; }
+ public string NidusType { get; set; }
+ public string NidusTypeCN { get; set; }
+ public DateTime CreateTime { get; set; }
+ public Guid CreateUserId { get; set; }
+ }
public class BatchAddTrialOrganInDto
{
public Guid TrialId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IOrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IOrganInfoService.cs
index 25eadf67..9ce2f24a 100644
--- a/IRaCIS.Core.Application/Service/Reading/Interface/IOrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Interface/IOrganInfoService.cs
@@ -13,8 +13,10 @@ namespace IRaCIS.Core.Application.Interfaces
public interface IOrganInfoService
{
-
- Task> GetOrganInfoList(OrganInfoQuery inQuery);
+
+
+
+ Task> GetOrganInfoList(OrganInfoQuery inQuery);
Task AddOrUpdateOrganInfo(OrganInfoAddOrEdit addOrEditOrganInfo);
diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
index dc83beba..977b8705 100644
--- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
@@ -21,14 +21,60 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository _organInfoRepository;
private readonly IRepository _organTrialInfoRepository;
+ private readonly IRepository _criterionNidusRepository;
public OrganInfoService(
IRepository organInfoRepository,
- IRepository organTrialInfoRepository
+ IRepository organTrialInfoRepository,
+ IRepository criterionNidusRepository
)
{
_organInfoRepository = organInfoRepository;
this._organTrialInfoRepository = organTrialInfoRepository;
+ this._criterionNidusRepository = criterionNidusRepository;
+ }
+
+ ///
+ /// 获取标准病灶列表
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task> GetCriterionNidusList(CriterionNidusQuery inQuery)
+ {
+
+ var criterionNidusQueryable = _criterionNidusRepository
+ .Where(x=>x.CriterionId== inQuery.CriterionId)
+ .ProjectTo(_mapper.ConfigurationProvider);
+
+ return await criterionNidusQueryable.ToListAsync();
+ }
+
+ ///
+ /// 新增修改标准病灶列表
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task AddOrUpdateCriterionNidus(CriterionNidusAddOrEdit addOrEditCriterionNidus)
+ {
+
+ var entity = await _criterionNidusRepository.InsertOrUpdateAsync(addOrEditCriterionNidus, true);
+
+ return ResponseOutput.Ok(entity.Id.ToString());
+
+ }
+
+ ///
+ /// 删除病灶列表
+ ///
+ ///
+ ///
+ [HttpDelete("{id:guid}")]
+ public async Task DeleteCriterionNidus(Guid id)
+ {
+ var success = await _criterionNidusRepository.DeleteFromQueryAsync(t => t.Id == id, true);
+ return ResponseOutput.Ok();
}
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index b12d3c17..f4c26fce 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -124,6 +124,10 @@ namespace IRaCIS.Core.Application.Service
#region 阅片部位
+
+ CreateMap();
+ CreateMap().ReverseMap();
+
CreateMap();
CreateMap();
#endregion
diff --git a/IRaCIS.Core.Domain/Reading/CriterionLesion.cs b/IRaCIS.Core.Domain/Reading/CriterionLesion.cs
new file mode 100644
index 00000000..3555c70a
--- /dev/null
+++ b/IRaCIS.Core.Domain/Reading/CriterionLesion.cs
@@ -0,0 +1,47 @@
+
+//--------------------------------------------------------------------
+// 此代码由T4模板自动生成 byzhouhang 20210918
+// 生成时间 2022-08-16 15:47:47
+// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace IRaCIS.Core.Domain.Models
+{
+ ///
+ /// 标准病灶中间表
+ ///
+ [Table("CriterionNidus")]
+ public class CriterionNidus : Entity, IAuditAdd
+ {
+
+ ///
+ /// 标准ID
+ ///
+ public Guid CriterionId { get; set; }
+
+ ///
+ /// 病灶类型
+ ///
+ public string NidusType { get; set; }
+
+ ///
+ /// 病灶类型
+ ///
+ public string NidusTypeCN { get; set; }
+
+ ///
+ /// CreateTime
+ ///
+ public DateTime CreateTime { get; set; }
+
+ ///
+ /// CreateUserId
+ ///
+ public Guid CreateUserId { get; set; }
+
+ }
+
+
+}
diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
index 4d3d348f..e0216681 100644
--- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
+++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
@@ -245,6 +245,8 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet ReadingMedicalReviewDialog { get; set; }
+ public virtual DbSet CriterionNidus { get; set; }
+
#endregion
#region Subject and Visit and study
diff --git a/IRaCIS.Core.Test/DbHelper.ttinclude b/IRaCIS.Core.Test/DbHelper.ttinclude
index 376d73d7..05632f13 100644
--- a/IRaCIS.Core.Test/DbHelper.ttinclude
+++ b/IRaCIS.Core.Test/DbHelper.ttinclude
@@ -4,7 +4,7 @@
public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
public static readonly string DbDatabase = "IRaCIS_New_Tet";
//ַ,ƴ
- public static readonly string TableName = "OrganTrialInfo";
+ public static readonly string TableName = "CriterionNidus";
//ļ service Ƿҳ
}
#>