修改一版

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; }
+    }
 
+    ///<summary>CriterionNidusQuery  列表查询参数模型</summary>
+    public class CriterionNidusQuery
+    {
+
+        public Guid CriterionId { get; set; }
+    }
+
+    ///<summary> CriterionNidusAddOrEdit  列表查询参数模型</summary>
+    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; }

IRaCIS.Core.Application/Service/Reading/Interface/IOrganInfoService.cs

@@ -13,8 +13,10 @@ namespace IRaCIS.Core.Application.Interfaces
 	public interface IOrganInfoService
     {
 
-	   
+      
-		 Task<List<OrganInfoView>>  GetOrganInfoList(OrganInfoQuery inQuery);
+
+
+        Task<List<OrganInfoView>>  GetOrganInfoList(OrganInfoQuery inQuery);
 	    
          Task<IResponseOutput> AddOrUpdateOrganInfo(OrganInfoAddOrEdit addOrEditOrganInfo);
 

IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs

@@ -21,14 +21,60 @@ namespace IRaCIS.Core.Application.Service
 
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<OrganTrialInfo> _organTrialInfoRepository;
+        private readonly IRepository<CriterionNidus> _criterionNidusRepository;
 
         public OrganInfoService(
             IRepository<OrganInfo> organInfoRepository,
-            IRepository<OrganTrialInfo> organTrialInfoRepository
+            IRepository<OrganTrialInfo> organTrialInfoRepository,
+            IRepository<CriterionNidus> criterionNidusRepository
             )
         {
             _organInfoRepository = organInfoRepository;
             this._organTrialInfoRepository = organTrialInfoRepository;
+            this._criterionNidusRepository = criterionNidusRepository;
+        }
+
+        /// <summary>
+        /// 获取标准病灶列表
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<CriterionNidusView>> GetCriterionNidusList(CriterionNidusQuery inQuery)
+        {
+
+            var criterionNidusQueryable = _criterionNidusRepository
+                .Where(x=>x.CriterionId== inQuery.CriterionId)
+            .ProjectTo<CriterionNidusView>(_mapper.ConfigurationProvider);
+
+            return await criterionNidusQueryable.ToListAsync();
+        }
+
+        /// <summary>
+        /// 新增修改标准病灶列表
+        /// </summary>
+        /// <param name="addOrEditCriterionNidus"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> AddOrUpdateCriterionNidus(CriterionNidusAddOrEdit addOrEditCriterionNidus)
+        {
+         
+            var entity = await _criterionNidusRepository.InsertOrUpdateAsync(addOrEditCriterionNidus, true);
+
+            return ResponseOutput.Ok(entity.Id.ToString());
+
+        }
+
+        /// <summary>
+        /// 删除病灶列表
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete("{id:guid}")]
+        public async Task<IResponseOutput> DeleteCriterionNidus(Guid id)
+        {
+            var success = await _criterionNidusRepository.DeleteFromQueryAsync(t => t.Id == id, true);
+            return ResponseOutput.Ok();
         }
 
 

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -124,6 +124,10 @@ namespace IRaCIS.Core.Application.Service
 
             #region 阅片部位
 
+
+            CreateMap<CriterionNidus, CriterionNidusView>();
+            CreateMap<CriterionNidus, CriterionNidusAddOrEdit>().ReverseMap();
+
             CreateMap<OrganInfoAddOrEdit, OrganInfo>();
             CreateMap<OrganInfo, OrganInfoView>();
             #endregion

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
+{
+	 /// <summary>
+	 /// 标准病灶中间表
+	 /// </summary>
+	 [Table("CriterionNidus")]	
+	 public class CriterionNidus : Entity, IAuditAdd
+	 {
+	 
+		/// <summary>
+        /// 标准ID
+        /// </summary>
+		public Guid CriterionId { get; set; }
+
+		/// <summary>
+		/// 病灶类型
+		/// </summary>
+		public string NidusType { get; set; }
+	
+		/// <summary>
+        /// 病灶类型
+        /// </summary>
+		public string NidusTypeCN { get; set; }
+	
+		/// <summary>
+        /// CreateTime
+        /// </summary>
+		public DateTime CreateTime { get; set; }
+	
+		/// <summary>
+        /// CreateUserId
+        /// </summary>
+		public Guid CreateUserId { get; set; }
+	 
+	 }
+
+	 
+}	 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -245,6 +245,8 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public virtual DbSet<ReadingMedicalReviewDialog> ReadingMedicalReviewDialog { get; set; }
 
+        public virtual DbSet<CriterionNidus> CriterionNidus { get; set; }
+
         #endregion
 
         #region Subject and Visit and study

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 可以配置是否分页
 	}
 #>