医生签到

src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs

@@ -325,6 +325,12 @@ namespace Shentun.Peis.RegisterChecks
             return entdto;
         }
 
+        /// <summary>
+        /// 保存结果
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
         [HttpPost("api/app/registercheck/UpdateCheckResult")]
         public async Task UpdateCheckResult(UpdateCheckResultDto input)
         {
@@ -808,7 +814,7 @@ namespace Shentun.Peis.RegisterChecks
                         //当天无记录  直接插入
                         doctorSignInEnt = new DoctorSignIn
                         {
-                            RoomId = doctorSignInEnt.RoomId,
+                            RoomId = input.RoomId,
                             SignInFlag = SignInFlag.SignIn
                         };
                         await _doctorSignInRepository.InsertAsync(doctorSignInEnt);
@@ -819,7 +825,7 @@ namespace Shentun.Peis.RegisterChecks
                     //签退
                     var doctorSignInEnt = await _doctorSignInRepository.FirstOrDefaultAsync(f => f.CreatorId == doctorId
                  && f.RoomId == input.RoomId
-                 && f.CreationTime.Date == DateTime.Now.Date);
+                 && f.CreationTime.Date == DateTime.Now.Date && f.SignInFlag == SignInFlag.SignIn);
                     if (doctorSignInEnt != null)
                     {
                         doctorSignInEnt.SignInFlag = SignInFlag.SignOut;

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.EntityFrameworkCore/Migrations/20241115014450_add_doctor_sign_in.cs

@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class add_doctor_sign_in : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "doctor_sign_in",
+                columns: table => new
+                {
+                    id = table.Column<Guid>(type: "uuid", fixedLength: true, nullable: false),
+                    room_id = table.Column<Guid>(type: "uuid", nullable: false, comment: "房间ID"),
+                    sign_in_flag = table.Column<char>(type: "character(1)", maxLength: 1, nullable: false, comment: "0-签到，1-签退"),
+                    sign_out_date = table.Column<DateTime>(type: "timestamp without time zone", nullable: true, comment: "签退日期"),
+                    concurrency_stamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true),
+                    creation_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    creator_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    last_modification_time = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    last_modifier_id = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_doctor_sign_in", x => x.id);
+                },
+                comment: "医生签到表");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "doctor_sign_in");
+        }
+    }
+}

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

@@ -4143,6 +4143,61 @@ namespace Shentun.Peis.Migrations
                     b.HasComment("疾病筛查类别设置");
                 });
 
+            modelBuilder.Entity("Shentun.Peis.Models.DoctorSignIn", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property<Guid?>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property<Guid>("RoomId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("room_id")
+                        .HasComment("房间ID");
+
+                    b.Property<char>("SignInFlag")
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("sign_in_flag")
+                        .HasComment("0-签到，1-签退");
+
+                    b.Property<DateTime?>("SignOutDate")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("sign_out_date")
+                        .HasComment("签退日期");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("doctor_sign_in");
+
+                    b.HasComment("医生签到表");
+                });
+
             modelBuilder.Entity("Shentun.Peis.Models.FieldComparison", b =>
                 {
                     b.Property<Guid>("Id")

src/Shentun.Peis.HttpApi.Host/appsettings.json

@@ -5,15 +5,15 @@
     "CorsOrigins": "https://*.Peis.com,http://localhost:4200,http://localhost:9530,http://192.168.1.108:9530,http://localhost:8080,http://localhost:8081",
     "RedirectAllowedUrls": "http://localhost:9530",
     "SelfUser": "admin",
-    //"SelfPassword": "Shentun!@#qwe123",
-    "SelfPassword": "666666",
+    "SelfPassword": "Shentun!@#qwe123",
+   // "SelfPassword": "666666",
     "LisUser": "admin",
-    //"LisPassword": "Shentun!@#qwe123"
-    "LisPassword": "666666"
+    "LisPassword": "Shentun!@#qwe123"
+   // "LisPassword": "666666"
   },
   "ConnectionStrings": {
-    "Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis0508;User ID=postgres;Password=st123;"
-    //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;"
+    //"Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis0508;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;"
   },
   "AuthServer": {