同步

src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs

@@ -834,11 +834,11 @@ namespace Shentun.Peis.TransToWebPeis
                     await WebDb.Ado.ExecuteCommandAsync("INSERT INTO public.patient_register(patient_register_id, patient_register_no, patient_id, medical_times, customer_org_id, customer_org_group_id, medical_package_id," +
                         "patient_name,sex_id, birth_date, age, job_card_no, medical_card_no, marital_status_id, medical_type_id, personnel_type_id, job_post, job_title, photo," +
                         " sex_hormone_term_id, interpose_measure, medical_conclusion_id, complete_flag, is_medical_start, medical_start_date, summary_date, is_audit, audit_date, is_vip, third_info,remark,medical_center_id," +
-                        "customer_org_register_id, concurrency_stamp, creation_time, creator_id, last_modification_time, last_modifier_id, audit_doctor_id,summary_doctor_id, his_patient_id,third_register_id) VALUES " +
+                        "customer_org_register_id, concurrency_stamp, creation_time, creator_id, last_modification_time, last_modifier_id, audit_doctor_id,summary_doctor_id, his_patient_id,third_register_id,appoint_patient_register_id) VALUES " +
                         "(@patient_register_id,@patient_register_no,@patient_id,@medical_times,@customer_org_id,@customer_org_group_id::uuid,@medical_package_id::uuid," +
                         "@patient_name,@sex_id,CAST(@birth_date as timestamp),@age,@job_card_no,@medical_card_no,@marital_status_id,@medical_type_id::uuid,@personnel_type_id::uuid,@job_post,@job_title,@photo," +
                         "@sex_hormone_term_id::uuid,@interpose_measure,@medical_conclusion_id::uuid,@complete_flag,@is_medical_start,@medical_start_date,CAST(@summary_date as timestamp),@is_audit,CAST(@audit_date as timestamp),@is_vip,@third_info,@remark,@medical_center_id," +
-                        "@customer_org_register_id,@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@audit_doctor_id::uuid,@summary_doctor_id::uuid,@his_patient_id,@third_register_id);",
+                        "@customer_org_register_id,@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@audit_doctor_id::uuid,@summary_doctor_id::uuid,@his_patient_id,@third_register_id,@appoint_patient_register_id);",
                         new List<SugarParameter>() {
                             new SugarParameter("patient_register_id",patientRegisterEnt.Id),
                             new SugarParameter("patient_register_no",patientRegisterEnt.PatientRegisterNo),
@@ -882,7 +882,8 @@ namespace Shentun.Peis.TransToWebPeis
                             new SugarParameter("audit_doctor_id",patientRegisterEnt.AuditDoctorId),
                             new SugarParameter("summary_doctor_id",patientRegisterEnt.SummaryDoctorId),
                             new SugarParameter("his_patient_id",patientRegisterEnt.HisPatientId),
-                            new SugarParameter("third_register_id",third_register_id)
+                            new SugarParameter("third_register_id",third_register_id),
+                            new SugarParameter("appoint_patient_register_id",patientRegisterEnt.AppointPatientRegisterId)
                       });
 
                     #endregion
@@ -903,10 +904,10 @@ namespace Shentun.Peis.TransToWebPeis
                         #region register_check
                         await WebDb.Ado.ExecuteCommandAsync("INSERT INTO public.register_check(register_check_id, patient_register_id, check_request_no, third_info, complete_flag, critical_value, critical_value_flag, critical_value_process_content," +
                                    "critical_value_process_flag, critical_value_process_doctor, critical_value_process_date, critical_value_create_date, check_doctor_id, check_date, is_audit," +
-                                   " auditor_user_id, audit_time, concurrency_stamp, creation_time, creator_id, last_modification_time, last_modifier_id, exec_organization_unit_id) VALUES " +
+                                   " auditor_user_id, audit_time, concurrency_stamp, creation_time, creator_id, last_modification_time, last_modifier_id, exec_organization_unit_id,is_sign_in,sign_in_person,sign_in_time) VALUES " +
                                    "(@register_check_id,@patient_register_id,@check_request_no,@third_info,@complete_flag,@critical_value,@critical_value_flag,@critical_value_process_content," +
                                    "@critical_value_process_flag,@critical_value_process_doctor,CAST(@critical_value_process_date as timestamp),CAST(@critical_value_create_date as timestamp),@check_doctor_id,CAST(@check_date as timestamp),@is_audit," +
-                                   "@auditor_user_id::uuid,CAST(@audit_time as timestamp),@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@exec_organization_unit_id::uuid);",
+                                   "@auditor_user_id::uuid,CAST(@audit_time as timestamp),@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@exec_organization_unit_id::uuid,@is_sign_in,@sign_in_person,@sign_in_time);",
                                    new List<SugarParameter>() {
                                        new SugarParameter("register_check_id",registerCheckWithDetail.Id),
                                        new SugarParameter("patient_register_id",registerCheckWithDetail.PatientRegisterId),
@@ -931,6 +932,9 @@ namespace Shentun.Peis.TransToWebPeis
                                        new SugarParameter("last_modification_time",registerCheckWithDetail.LastModificationTime),
                                        new SugarParameter("last_modifier_id",registerCheckWithDetail.LastModifierId),
                                        new SugarParameter("exec_organization_unit_id",registerCheckWithDetail.ExecOrganizationUnitId),
+                                       new SugarParameter("is_sign_in",registerCheckWithDetail.IsSignIn),
+                                       new SugarParameter("sign_in_person",registerCheckWithDetail.SignInPerson),
+                                       new SugarParameter("sign_in_time",registerCheckWithDetail.SignInTime)
                                  });
                         #endregion
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240605024928_init20240605001.cs

@@ -0,0 +1,52 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240605001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<char>(
+                name: "is_sign_in",
+                table: "register_check",
+                type: "character(1)",
+                maxLength: 1,
+                nullable: false,
+                defaultValueSql: "'N'",
+                comment: "是签收");
+
+            migrationBuilder.AddColumn<string>(
+                name: "sign_in_person",
+                table: "register_check",
+                type: "character varying(16)",
+                maxLength: 16,
+                nullable: true,
+                comment: "签收人姓名");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "sign_in_time",
+                table: "register_check",
+                type: "timestamp without time zone",
+                nullable: true,
+                comment: "签收时间");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "is_sign_in",
+                table: "register_check");
+
+            migrationBuilder.DropColumn(
+                name: "sign_in_person",
+                table: "register_check");
+
+            migrationBuilder.DropColumn(
+                name: "sign_in_time",
+                table: "register_check");
+        }
+    }
+}

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

@@ -8295,6 +8295,14 @@ namespace Shentun.Peis.Migrations
                         .HasDefaultValueSql("'N'")
                         .HasComment("是否锁住");
 
+                    b.Property<char>("IsSignIn")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_sign_in")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("是签收");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .IsRequired()
                         .HasColumnType("timestamp without time zone")
@@ -8309,6 +8317,17 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("uuid")
                         .HasColumnName("patient_register_id");
 
+                    b.Property<string>("SignInPerson")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("sign_in_person")
+                        .HasComment("签收人姓名");
+
+                    b.Property<DateTime?>("SignInTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("sign_in_time")
+                        .HasComment("签收时间");
+
                     b.Property<string>("ThirdInfo")
                         .HasMaxLength(80)
                         .HasColumnType("character varying(80)")