云胶片功能

src/Shentun.WebPeis.Application.Contracts/Persons/GetIsPacsCheckListDto.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.WebPeis.Persons
+{
+    public class GetIsPacsCheckListDto
+    {
+        /// <summary>
+        /// 项目名字
+        /// </summary>
+        public string AsbitemName { get; set; }
+
+        /// <summary>
+        /// 条码号
+        /// </summary>
+        public string CheckRequestNo { get; set; }
+
+        /// <summary>
+        /// pacs dicom检查日期
+        /// </summary>
+        public string PacsCheckDate { get; set; }
+    }
+}

src/Shentun.WebPeis.Application/Persons/PersonAppService.cs

@@ -64,6 +64,9 @@ namespace Shentun.WebPeis.Persons
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IRepository<CustomerOrg> _customerOrgRepository;
         private readonly SysParmValueManager _sysParmValueManager;
+        private readonly IRepository<RegisterCheck> _registerCheckRepository;
+        private readonly IRepository<RegisterCheckAsbitem> _registerCheckAsbitemRepository;
+        private readonly IRepository<Asbitem> _asbitemRepository;
         public PersonAppService(IRepository<Person> repository,
              IConfiguration configuration,
              IRepository<Volo.Abp.Identity.IdentityUser, Guid> identityUserRepository,
@@ -78,7 +81,10 @@ namespace Shentun.WebPeis.Persons
              IHttpContextAccessor httpContextAccessor,
              IRepository<CustomerOrg> customerOrgRepository,
              IRepository<QuestionRegister> questionRegisterRepository,
-             SysParmValueManager sysParmValueManager)
+             SysParmValueManager sysParmValueManager,
+             IRepository<RegisterCheck> registerCheckRepository,
+             IRepository<RegisterCheckAsbitem> registerCheckAsbitemRepository,
+             IRepository<Asbitem> asbitemRepository)
         {
             _repository = repository;
             _configuration = configuration;
@@ -95,6 +101,9 @@ namespace Shentun.WebPeis.Persons
             _customerOrgRepository = customerOrgRepository;
             _questionRegisterRepository = questionRegisterRepository;
             _sysParmValueManager = sysParmValueManager;
+            _registerCheckRepository = registerCheckRepository;
+            _registerCheckAsbitemRepository = registerCheckAsbitemRepository;
+            _asbitemRepository = asbitemRepository;
         }
 
         public async Task<PersonDto> GetByIdAsync(PersonIdInputDto input)
@@ -431,7 +440,7 @@ namespace Shentun.WebPeis.Persons
 
         }
         /// <summary>
-        /// 获取体检次数列表
+        /// 获取体检次数列表  显示报告的列表
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -460,6 +469,43 @@ namespace Shentun.WebPeis.Persons
 
         }
 
+
+        /// <summary>
+        /// 获取pacs文件检查的项目列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/app/Person/GetIsPacsCheckList")]
+        public async Task<List<GetIsPacsCheckListDto>> GetIsPacsCheckListAsync(PatientRegisterIdInputDto input)
+        {
+            var query = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+                         join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.PatientRegisterId equals registerCheck.PatientRegisterId
+                         join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.RegisterCheckId equals registerCheckAsbitem.RegisterCheckId
+                         join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.AsbitemId
+                         where patientRegister.PatientRegisterId == input.PatientRegisterId
+                         select new
+                         {
+                             registerCheck.CheckRequestNo,
+                             asbitem.AsbitemName,
+                             registerCheck.PacsCheckDate
+                         }).ToList();
+
+
+            var entListDto = new List<GetIsPacsCheckListDto>();
+
+            if (query.Count > 0)
+            {
+                entListDto = query.GroupBy(g => g.CheckRequestNo).Select(s => new GetIsPacsCheckListDto
+                {
+                    CheckRequestNo = s.Key,
+                    AsbitemName = string.Join(",", s.Select(ss => ss.AsbitemName).Distinct().ToList()),
+                    PacsCheckDate = DataHelper.ConversionDateToString(s.FirstOrDefault().PacsCheckDate)
+                }).ToList();
+            }
+
+            return entListDto;
+        }
+
         /// <summary>
         /// 获取本人和亲属列表
         /// </summary>

src/Shentun.WebPeis.Domain/Models/RegisterCheck.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.Domain.Entities;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 
 namespace Shentun.WebPeis.Models;
 
@@ -95,6 +97,23 @@ public partial class RegisterCheck : AuditedEntity, IHasConcurrencyStamp
 
     public Guid? ExecOrganizationUnitId { get; set; }
 
+    /// <summary>
+    /// 是否pacs检查 dicom上传为准
+    /// </summary>
+    [MaxLength(1)]
+    public char IsPacsCheck { get; set; }
+
+    /// <summary>
+    /// pacs dicom检查日期
+    /// </summary>
+    public DateTime? PacsCheckDate { get; set; }
+
+    /// <summary>
+    /// pacs dicom文件上传日期
+    /// </summary>
+    public DateTime? PacsUploadDate { get; set; }
+
+
     public virtual ICollection<RegisterCheckItem> RegisterCheckItems { get; set; } = new List<RegisterCheckItem>();
 
     public virtual ICollection<RegisterCheckPicture> RegisterCheckPictures { get; set; } = new List<RegisterCheckPicture>();

src/Shentun.WebPeis.EntityFrameworkCore/Configures/RegisterCheckConfigure.cs

@@ -93,6 +93,8 @@ namespace Shentun.WebPeis.Configures
                 .HasMaxLength(80)
                 .HasComment("第三方信息")
                 .HasColumnName("third_info");
+
+            entity.Property(e=>e.IsPacsCheck).HasComment("是否pacs检查 dicom上传为准").IsRequired().HasDefaultValueSql("'N'");
         }
     }
 }