pacs词条

src/Shentun.Peis.Application.Contracts/BigtextResultConclusions/BigtextResultConclusionDto.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 
 namespace Shentun.Peis.BigtextResultConclusions
@@ -11,6 +12,11 @@ namespace Shentun.Peis.BigtextResultConclusions
         /// </summary>
         public Guid BigtextResultTemplateId { get; set; }
 
+        /// <summary>
+        /// 是否为异常结论  Y=异常结论  N=正常结论   默认异常结论
+        /// </summary>
+        public char IsAbnormal { get; set; } 
+
         /// <summary>
         /// 结论
         /// </summary>

src/Shentun.Peis.Application.Contracts/BigtextResultConclusions/CreateBigtextResultConclusionDto.cs

@@ -11,6 +11,11 @@ namespace Shentun.Peis.BigtextResultConclusions
         /// </summary>
         public Guid BigtextResultTemplateId { get; set; }
 
+        /// <summary>
+        /// 是否为异常结论  Y=异常结论  N=正常结论   默认异常结论
+        /// </summary>
+        public char IsAbnormal { get; set; } = 'Y';
+
         /// <summary>
         /// 结论
         /// </summary>

src/Shentun.Peis.Application.Contracts/BigtextResultConclusions/UpdateBigtextResultConclusionDto.cs

@@ -14,6 +14,11 @@ namespace Shentun.Peis.BigtextResultConclusions
         /// </summary>
         public Guid BigtextResultTemplateId { get; set; }
 
+        /// <summary>
+        /// 是否为异常结论  Y=异常结论  N=正常结论   默认异常结论
+        /// </summary>
+        public char IsAbnormal { get; set; }
+
         /// <summary>
         /// 结论
         /// </summary>

src/Shentun.Peis.Application.Contracts/BigtextResultTemplates/GetBigtextResultTemplateDetailDto.cs

@@ -46,5 +46,10 @@ namespace Shentun.Peis.BigtextResultTemplates
         /// 结论
         /// </summary>
         public string Conclusion { get; set; }
+
+        /// <summary>
+        /// 是否为异常结论  Y=异常结论  N=正常结论   默认异常结论 
+        /// </summary>
+        public char IsAbnormal { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/PacsBusiness/GetDicomFileDetailIsExistDto.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.PacsBusiness
+{
+    public class GetDicomFileDetailIsExistDto
+    {
+        public int FileCount { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/PacsBusiness/GetDicomFileDetailIsExistInputDto.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace Shentun.Peis.PacsBusiness
+{
+    public class GetDicomFileDetailIsExistInputDto
+    {
+        /// <summary>
+        /// 条码号
+        /// </summary>
+        public string CheckRequestNo { get; set; }
+
+        /// <summary>
+        /// 实例ID
+        /// </summary>
+        public string InstanceId { get; set; }
+    }
+}

src/Shentun.Peis.Application/BigtextResultConclusions/BigtextResultConclusionAppService.cs

@@ -76,6 +76,7 @@ namespace Shentun.Peis.BigtextResultConclusions
                 Conclusion = s.Conclusion,
                 DisplayOrder = s.DisplayOrder,
                 Id = s.Id,
+                IsAbnormal = s.IsAbnormal,
                 BigtextResultTemplateId = s.BigtextResultTemplateId,
                 LastModificationTime = s.LastModificationTime,
                 LastModifierId = s.LastModifierId,

src/Shentun.Peis.Application/BigtextResultTemplates/BigtextResultTemplateAppService.cs

@@ -197,7 +197,8 @@ namespace Shentun.Peis.BigtextResultTemplates
                                     {
                                         BigtextResultTemplateId = bigtextResultTemplate.Id,
                                         BigtextResultTemplateName = bigtextResultTemplate.DisplayName,
-                                        Conclusion = bigtextResultConclusion.Conclusion
+                                        Conclusion = bigtextResultConclusion.Conclusion,
+                                        IsAbnormal = bigtextResultConclusion.IsAbnormal
                                     });
 
             if (input.BigtextResultTemplateIds.Any())

src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs

@@ -584,7 +584,7 @@ namespace Shentun.Peis.PacsBusiness
                 RegisterCheckId = s.Key.RegisterCheckId
             }).ToList();
 
-            
+
 
             return entListDto;
         }
@@ -624,6 +624,49 @@ namespace Shentun.Peis.PacsBusiness
             }
         }
 
+
+        /// <summary>
+        /// 获取dicom文件的数量  根据检查条码号或者实例ID查询
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/app/PacsBusiness/GetDicomFileDetailIsExist")]
+        public async Task<GetDicomFileDetailIsExistDto> GetDicomFileDetailIsExistAsync(GetDicomFileDetailIsExistInputDto input)
+        {
+
+            if (string.IsNullOrWhiteSpace(input.CheckRequestNo)
+                && string.IsNullOrWhiteSpace(input.InstanceId))
+            {
+                throw new UserFriendlyException("请求参数不能为空");
+            }
+
+
+            var query = from dicomFileDetail in await _dicomFileDetailRepository.GetQueryableAsync()
+                        join registerCheck in await _registerCheckRepository.GetQueryableAsync() on dicomFileDetail.RegisterCheckId equals registerCheck.Id
+                        select new
+                        {
+                            checkRequestNo = registerCheck.CheckRequestNo,
+                            instanceId = dicomFileDetail.InstanceId
+                        };
+
+            if (!string.IsNullOrWhiteSpace(input.CheckRequestNo))
+            {
+                query = query.Where(m => m.checkRequestNo == input.CheckRequestNo);
+            }
+
+            if (!string.IsNullOrWhiteSpace(input.InstanceId))
+            {
+                query = query.Where(m => m.instanceId == input.InstanceId);
+            }
+
+            var entDto = new GetDicomFileDetailIsExistDto
+            {
+                FileCount = query.Count()
+            };
+
+            return entDto;
+        }
+
         /// <summary>
         /// 调用dicom服务api
         /// </summary>

src/Shentun.Peis.Domain/BigtextResultConclusions/BigtextResultConclusion.cs

@@ -24,6 +24,16 @@ namespace Shentun.Peis.Models
         [Column("conclusion")]
         [StringLength(200)]
         public string Conclusion { get; set; } = null!;
+
+
+        /// <summary>
+        /// 是否为异常结论  Y=异常结论  N=正常结论   默认异常结论
+        /// </summary>
+        [Column("is_abnormal")]
+        [MaxLength(1)]
+        public char IsAbnormal { get; set; }
+
+
         [Column("display_order")]
         public int DisplayOrder { get; set; }
 

src/Shentun.Peis.Domain/BigtextResultConclusions/BigtextResultConclusionManager.cs

@@ -35,6 +35,7 @@ namespace Shentun.Peis.BigtextResultConclusions
             {
                 Conclusion = entity.Conclusion,
                 BigtextResultTemplateId = entity.BigtextResultTemplateId,
+                IsAbnormal = entity.IsAbnormal,
                 DisplayOrder = await EntityHelper.CreateMaxDisplayOrder(_bigtextResultConclusionRepository)
             };
         }
@@ -55,6 +56,7 @@ namespace Shentun.Peis.BigtextResultConclusions
 
             targetEntity.Conclusion = sourceEntity.Conclusion;
             targetEntity.BigtextResultTemplateId = sourceEntity.BigtextResultTemplateId;
+            targetEntity.IsAbnormal = sourceEntity.IsAbnormal;
         }
 
 

src/Shentun.Peis.EntityFrameworkCore/DbMapping/BigtextResultConclusions/BigtextResultConclusionDbMapping.cs

@@ -16,10 +16,12 @@ namespace Shentun.Peis.DbMapping
         {
             entity.HasComment("大文本结果结论");
             entity.Property(t => t.Conclusion).HasComment("结论");
+            entity.Property(t=>t.IsAbnormal).HasComment("是否为异常结论").HasDefaultValueSql("'Y'");
             entity.Property(e => e.Id).IsFixedLength();
 
             entity.Property(e => e.BigtextResultTemplateId).IsFixedLength().IsRequired();
 
+
             //entity.Property(e => e.CreationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");
 
             entity.Property(e => e.DisplayOrder).HasDefaultValueSql("999999");

src/Shentun.Peis.EntityFrameworkCore/Migrations/20241112093748_update_bigtext_result_conclusion_insert_is_abnormal.cs

@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class update_bigtext_result_conclusion_insert_is_abnormal : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<char>(
+                name: "is_abnormal",
+                table: "bigtext_result_conclusion",
+                type: "character(1)",
+                nullable: false,
+                defaultValueSql: "'Y'",
+                comment: "是否为异常结论");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "is_abnormal",
+                table: "bigtext_result_conclusion");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -864,6 +864,14 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("display_order")
                         .HasDefaultValueSql("999999");
 
+                    b.Property<char>("IsAbnormal")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_abnormal")
+                        .HasDefaultValueSql("'Y'")
+                        .HasComment("是否为异常结论");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .IsRequired()
                         .HasColumnType("timestamp without time zone")