pacs

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

@@ -26,22 +26,22 @@ namespace Shentun.Peis.PacsBusiness
         /// <summary>
         /// 实例ID
         /// </summary>
-        public Guid InstanceId { get; set; }
+        public string InstanceId { get; set; }
 
         /// <summary>
         /// 患者ID
         /// </summary>
-        public Guid ParentPatientId { get; set; }
+        public string ParentPatientId { get; set; }
 
         /// <summary>
         /// 系列ID
         /// </summary>
-        public Guid ParentSeriesId { get; set; }
+        public string ParentSeriesId { get; set; }
 
         /// <summary>
         /// 研究ID
         /// </summary>
-        public Guid ParentStudyId { get; set; }
+        public string ParentStudyId { get; set; }
 
         /// <summary>
         /// 路径

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

@@ -16,22 +16,22 @@ namespace Shentun.Peis.PacsBusiness
         /// <summary>
         /// 实例ID
         /// </summary>
-        public Guid InstanceId { get; set; }
+        public string InstanceId { get; set; }
 
         /// <summary>
         /// 患者ID
         /// </summary>
-        public Guid ParentPatientId { get; set; }
+        public string ParentPatientId { get; set; }
 
         /// <summary>
         /// 系列ID
         /// </summary>
-        public Guid ParentSeriesId { get; set; }
+        public string ParentSeriesId { get; set; }
 
         /// <summary>
         /// 研究ID
         /// </summary>
-        public Guid ParentStudyId { get; set; }
+        public string ParentStudyId { get; set; }
 
         /// <summary>
         /// 路径

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

@@ -434,16 +434,16 @@ namespace Shentun.Peis.PacsBusiness
             if (registerCheckEnt == null)
                 throw new UserFriendlyException("条码号不正确");
 
-            if (input.InstanceId == Guid.Empty)
+            if (!string.IsNullOrWhiteSpace(input.InstanceId))
                 throw new UserFriendlyException("InstanceId不正确");
 
-            if (input.ParentStudyId == Guid.Empty)
+            if (!string.IsNullOrWhiteSpace(input.ParentStudyId))
                 throw new UserFriendlyException("ParentStudyId不正确");
 
-            if (input.ParentPatientId == Guid.Empty)
+            if (!string.IsNullOrWhiteSpace(input.ParentPatientId))
                 throw new UserFriendlyException("ParentPatientId不正确");
 
-            if (input.ParentSeriesId == Guid.Empty)
+            if (!string.IsNullOrWhiteSpace(input.ParentSeriesId))
                 throw new UserFriendlyException("ParentSeriesId不正确");
 
             if (string.IsNullOrWhiteSpace(input.Status))

src/Shentun.Peis.Domain/DicomFileDetails/DicomFileDetail.cs

@@ -28,25 +28,25 @@ namespace Shentun.Peis.Models
         /// 实例ID
         /// </summary>
         [Column("instance_id")]
-        public Guid InstanceId { get; set; }
+        public string InstanceId { get; set; }
 
         /// <summary>
         /// 患者ID
         /// </summary>
         [Column("parent_patient_id")]
-        public Guid ParentPatientId { get; set; }
+        public string ParentPatientId { get; set; }
 
         /// <summary>
         /// 系列ID
         /// </summary>
         [Column("parent_series_id")]
-        public Guid ParentSeriesId { get; set; }
+        public string ParentSeriesId { get; set; }
 
         /// <summary>
         /// 研究ID
         /// </summary>
         [Column("parent_study_id")]
-        public Guid ParentStudyId { get; set; }
+        public string ParentStudyId { get; set; }
 
         /// <summary>
         /// 路径

src/Shentun.Peis.EntityFrameworkCore/Migrations/20241028083934_update_third_book_position.cs

@@ -0,0 +1,142 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class update_third_book_position : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "marital_status_name",
+                table: "third_booking");
+
+            migrationBuilder.AddColumn<string>(
+                name: "emp_status",
+                table: "third_booking",
+                type: "character varying(1)",
+                maxLength: 1,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "marital_status",
+                table: "third_booking",
+                type: "character varying(1)",
+                maxLength: 1,
+                nullable: true,
+                comment: "婚姻状况");
+
+            migrationBuilder.AddColumn<string>(
+                name: "position_name",
+                table: "third_booking",
+                type: "character varying(100)",
+                maxLength: 100,
+                nullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "parent_study_id",
+                table: "dicom_file_detail",
+                type: "text",
+                nullable: false,
+                comment: "研究ID",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldComment: "研究ID");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "parent_series_id",
+                table: "dicom_file_detail",
+                type: "text",
+                nullable: false,
+                comment: "系列ID",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldComment: "系列ID");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "parent_patient_id",
+                table: "dicom_file_detail",
+                type: "text",
+                nullable: false,
+                comment: "患者ID",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldComment: "患者ID");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "instance_id",
+                table: "dicom_file_detail",
+                type: "text",
+                nullable: false,
+                comment: "实例ID",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldComment: "实例ID");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "emp_status",
+                table: "third_booking");
+
+            migrationBuilder.DropColumn(
+                name: "marital_status",
+                table: "third_booking");
+
+            migrationBuilder.DropColumn(
+                name: "position_name",
+                table: "third_booking");
+
+            migrationBuilder.AddColumn<string>(
+                name: "marital_status_name",
+                table: "third_booking",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: true,
+                comment: "婚姻状况");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "parent_study_id",
+                table: "dicom_file_detail",
+                type: "uuid",
+                nullable: false,
+                comment: "研究ID",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldComment: "研究ID");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "parent_series_id",
+                table: "dicom_file_detail",
+                type: "uuid",
+                nullable: false,
+                comment: "系列ID",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldComment: "系列ID");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "parent_patient_id",
+                table: "dicom_file_detail",
+                type: "uuid",
+                nullable: false,
+                comment: "患者ID",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldComment: "患者ID");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "instance_id",
+                table: "dicom_file_detail",
+                type: "uuid",
+                nullable: false,
+                comment: "实例ID",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldComment: "实例ID");
+        }
+    }
+}

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

@@ -4016,8 +4016,9 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("file_name")
                         .HasComment("文件名称");
 
-                    b.Property<Guid>("InstanceId")
-                        .HasColumnType("uuid")
+                    b.Property<string>("InstanceId")
+                        .IsRequired()
+                        .HasColumnType("text")
                         .HasColumnName("instance_id")
                         .HasComment("实例ID");
 
@@ -4031,18 +4032,21 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("uuid")
                         .HasColumnName("last_modifier_id");
 
-                    b.Property<Guid>("ParentPatientId")
-                        .HasColumnType("uuid")
+                    b.Property<string>("ParentPatientId")
+                        .IsRequired()
+                        .HasColumnType("text")
                         .HasColumnName("parent_patient_id")
                         .HasComment("患者ID");
 
-                    b.Property<Guid>("ParentSeriesId")
-                        .HasColumnType("uuid")
+                    b.Property<string>("ParentSeriesId")
+                        .IsRequired()
+                        .HasColumnType("text")
                         .HasColumnName("parent_series_id")
                         .HasComment("系列ID");
 
-                    b.Property<Guid>("ParentStudyId")
-                        .HasColumnType("uuid")
+                    b.Property<string>("ParentStudyId")
+                        .IsRequired()
+                        .HasColumnType("text")
                         .HasColumnName("parent_study_id")
                         .HasComment("研究ID");
 
@@ -11765,6 +11769,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("department_name")
                         .HasComment("部门");
 
+                    b.Property<string>("EmpStatus")
+                        .HasMaxLength(1)
+                        .HasColumnType("character varying(1)")
+                        .HasColumnName("emp_status");
+
                     b.Property<string>("ICode")
                         .HasColumnType("text")
                         .HasColumnName("icode");
@@ -11793,10 +11802,10 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("uuid")
                         .HasColumnName("last_modifier_id");
 
-                    b.Property<string>("MaritalStatusName")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("marital_status_name")
+                    b.Property<string>("MaritalStatus")
+                        .HasMaxLength(1)
+                        .HasColumnType("character varying(1)")
+                        .HasColumnName("marital_status")
                         .HasComment("婚姻状况");
 
                     b.Property<char>("MedicalStatus")
@@ -11819,6 +11828,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("phone")
                         .HasComment("电话");
 
+                    b.Property<string>("PositionName")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("position_name");
+
                     b.Property<string>("SexName")
                         .HasMaxLength(2)
                         .HasColumnType("character varying(2)")