worklist

src/Shentun.Peis.Application.Contracts/Worklists/CreateRegisterCheckWorklistInputDto.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.Worklists
+{
+    public class CreateRegisterCheckWorklistInputDto
+    {
+        /// <summary>
+        /// 预检Aet
+        /// </summary>
+        public string ScheduledAET { get; set; }
+
+        /// <summary>
+        /// 检查条码
+        /// </summary>
+        public string CheckRequestNo { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/Worklists/GetWorklistPatientListDto.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.Worklists
+{
+    public class GetWorklistPatientListDto
+    {
+        public string AccessionNumber { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 检查条码号
+        /// </summary>
+        public string PatientID { get; set; } = string.Empty;
+
+        public string Surname { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Forename { get; set; } = string.Empty;
+
+        public string Title { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string Sex { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 出生日期
+        /// </summary>
+        public DateTime DateOfBirth { get; set; } = DateTime.Now;
+
+        public string ReferringPhysician { get; set; } = string.Empty;
+
+        public string PerformingPhysician { get; set; } = string.Empty;
+
+        public string Modality { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 扫码日期
+        /// </summary>
+        public DateTime ExamDateAndTime { get; set; } = DateTime.Now;
+
+        public string ExamRoom { get; set; } = string.Empty;
+
+        public string ExamDescription { get; set; } = string.Empty;
+
+        public string StudyUID { get; set; } = string.Empty;
+
+        public string ProcedureID { get; set; } = string.Empty;
+
+        public string ProcedureStepID { get; set; } = string.Empty;
+
+        public string HospitalName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 预检Aet
+        /// </summary>
+        public string ScheduledAET { get; set; } = string.Empty;
+
+    }
+}

src/Shentun.Peis.Application.Contracts/Worklists/GetWorklistPatientListInputDto.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace Shentun.Peis.Worklists
+{
+    public class GetWorklistPatientListInputDto
+    {
+        /// <summary>
+        /// 预检AET
+        /// </summary>
+        public string ScheduledAet { get; set; }
+
+        /// <summary>
+        /// 设备类型
+        /// </summary>
+        public string Modality { get; set; }
+
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string StartDate { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string EndDate { get; set; }
+    }
+}

src/Shentun.Peis.Application/Worklists/WorklistAppService.cs

@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Shentun.Peis.Worklists
+{
+    [ApiExplorerSettings(GroupName = "Work")]
+    [Authorize]
+    public class WorklistAppService : ApplicationService
+    {
+        public WorklistAppService()
+        {
+
+        }
+
+        /// <summary>
+        /// 获取worklist数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("api/app/Worklist/GetWorklistPatientList")]
+        public async Task<List<GetWorklistPatientListDto>> GetWorklistPatientListAsync(GetWorklistPatientListInputDto input)
+        {
+            return new List<GetWorklistPatientListDto>();
+        }
+
+
+        /// <summary>
+        /// 创建检查项目worklist数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("api/app/Worklist/CreateRegisterCheckWorklist")]
+        public async Task CreateRegisterCheckWorklistAsync(CreateRegisterCheckWorklistInputDto input)
+        {
+             
+        }
+    }
+}

src/Shentun.Peis.DbMigrator/appsettings.json

@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;"
-    //"Default": "Host=192.168.2.67;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;"
+    //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;"
+    "Default": "Host=192.168.2.67;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;"
     //"Default": "Host=localhost;Port=5432;Database=ShentunPeis1218;User ID=postgres;Password=wxd123;"
     //"Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis0508;User ID=postgres;Password=st123;"
   },

src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs

@@ -291,6 +291,24 @@ namespace Shentun.Peis.Models
         [Column("lis_sample_no")]
         public string LisSampleNo { get; set; }
 
+        /// <summary>
+        /// Worklist标记(0-默认值，1-已扫码登记，2-设备已获取数据，预留设计)
+        /// </summary>
+        [Column("worklist_flag")]
+        public char WorklistFlag { get; set; }
+
+        /// <summary>
+        /// 预检AET
+        /// </summary>
+        [Column("scheduled_aet")]
+        public string ScheduledAet { get; set; }
+
+        /// <summary>
+        /// 预检日期
+        /// </summary>
+        [Column("worklist_pre_check_date")]
+        public DateTime? WorklistPreCheckDate { get; set; }
+
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 

src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterChecks/RegisterCheckDbMapping.cs

@@ -38,7 +38,8 @@ namespace Shentun.Peis.DbMapping
             entity.Property(t => t.IsPacsCheck).HasComment("是否pacs检查 dicom上传为准").IsRequired().HasDefaultValueSql("'N'");
             entity.Property(t => t.PacsCheckDate).HasComment("pacs dicom检查日期");
             entity.Property(t => t.PacsUploadDate).HasComment("pacs dicom文件上传日期");
-
+            entity.Property(t => t.WorklistFlag).HasComment("Worklist标记(0-默认值，1-已扫码登记，2-设备已获取数据，预留设计)").HasDefaultValueSql("'0'");
+            entity.Property(t => t.ScheduledAet).HasComment("预检AET");
             entity.Property(e => e.Id).ValueGeneratedNever();
 
             //entity.Property(e => e.LastModificationTime).HasDefaultValueSql("(date(timezone('UTC-8'::text, now())) - 1)");

src/Shentun.Peis.EntityFrameworkCore/Migrations/20241127143729_add_register_check_worklist.cs

@@ -0,0 +1,49 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class add_register_check_worklist : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "scheduled_aet",
+                table: "register_check",
+                type: "text",
+                nullable: true,
+                comment: "预检AET");
+
+            migrationBuilder.AddColumn<char>(
+                name: "worklist_flag",
+                table: "register_check",
+                type: "character(1)",
+                nullable: false,
+                defaultValueSql: "'0'",
+                comment: "Worklist标记(0-默认值，1-已扫码登记，2-设备已获取数据，预留设计)");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "worklist_pre_check_date",
+                table: "register_check",
+                type: "timestamp without time zone",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "scheduled_aet",
+                table: "register_check");
+
+            migrationBuilder.DropColumn(
+                name: "worklist_flag",
+                table: "register_check");
+
+            migrationBuilder.DropColumn(
+                name: "worklist_pre_check_date",
+                table: "register_check");
+        }
+    }
+}

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

@@ -8925,6 +8925,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("uuid")
                         .HasColumnName("patient_register_id");
 
+                    b.Property<string>("ScheduledAet")
+                        .HasColumnType("text")
+                        .HasColumnName("scheduled_aet")
+                        .HasComment("预检AET");
+
                     b.Property<string>("SignInPerson")
                         .HasMaxLength(16)
                         .HasColumnType("character varying(16)")
@@ -8942,6 +8947,17 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("third_info")
                         .HasComment("第三方信息");
 
+                    b.Property<char>("WorklistFlag")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("character(1)")
+                        .HasColumnName("worklist_flag")
+                        .HasDefaultValueSql("'0'")
+                        .HasComment("Worklist标记(0-默认值，1-已扫码登记，2-设备已获取数据，预留设计)");
+
+                    b.Property<DateTime?>("WorklistPreCheckDate")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("worklist_pre_check_date");
+
                     b.HasKey("Id");
 
                     b.HasIndex(new[] { "CheckRequestNo" }, "ix_register_check_1");