预登记转正式登记更新登记人

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -970,9 +970,26 @@ namespace Shentun.Peis.PatientRegisters
             else
             {
                 entity = await Repository.GetAsync((Guid)input.PatientRegisterId);
+                char oldCompleteFlag = entity.CompleteFlag; //更新前状态
                 await _manager.UpdateAsync(updatePatientRegisterArg, entity);
                 createRegisterCheckAsbitemEntity = await _registerAsbitemManager.UpdateManyAsync(entity, registerAsbitems);
 
+                #region 预登记转正式登记修改登记者ID
+
+                string goRegisterIsUpdateRegisterPerson = await _sysParmValueManager.GetSysParmValueAsync(Guid.Empty, "go_register_is_update_register_person");
+                if (goRegisterIsUpdateRegisterPerson == "1")
+                {
+                    if (oldCompleteFlag == PatientRegisterCompleteFlag.PreRegistration
+                             && entity.CompleteFlag == PatientRegisterCompleteFlag.Registration
+                             && _currentUser.Id != null)
+                    {
+                        //判断是预登记转正式登记
+                        entity.UpdateCreatorId(_currentUser.Id.Value);
+                    }
+                }
+
+                #endregion
+
                 await _repository.UpdateAsync(entity);
 
                 #region 扩展表
@@ -3741,6 +3758,19 @@ namespace Shentun.Peis.PatientRegisters
                             {
                                 f.PatientRegisterNo = _manager.CreatePatientRegisterNo(f.MedicalCenterId).Result;
                             }
+                            #region 预登记转正式登记修改登记者ID
+
+                            string goRegisterIsUpdateRegisterPerson = _sysParmValueManager.GetSysParmValueAsync(Guid.Empty, "go_register_is_update_register_person").GetAwaiter().GetResult();
+                            if (goRegisterIsUpdateRegisterPerson == "1")
+                            {
+                                if (_currentUser.Id != null)
+                                {
+                                    //判断是预登记转正式登记
+                                    f.UpdateCreatorId(_currentUser.Id.Value);
+                                }
+                            }
+
+                            #endregion
                         }
                         f.CompleteFlag = input.CompleteFlag.Value;
                     }

src/Shentun.Peis.Domain/PatientRegisters/PatientRegister.cs

@@ -324,6 +324,15 @@ namespace Shentun.Peis.Models
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 
+        /// <summary>
+        /// 修改登记人
+        /// </summary>
+        /// <param name="id"></param>
+        public void UpdateCreatorId(Guid id)
+        {
+            CreatorId = id;
+        }
+
 
         //[Column("concurrency_stamp")]
         //[StringLength(40)]

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

@@ -5,20 +5,20 @@
     "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": "666666",
+    "SelfPassword": "Shentun!@#qwe123",
     "LisUser": "admin",
-    "LisPassword": "666666"
+    "LisPassword": "Shentun!@#qwe123"
   },
   "ConnectionStrings": {
     //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;"
-    //"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;"
   },
   "AuthServer": {
     "Authority": "http://localhost:9530",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "localhost_Swagger",
-    "IssuerBase": "http://140.143.162.39:9529" 
+    "IssuerBase": "http://localhost:9530"
   },
   "StringEncryption": {
     "DefaultPassPhrase": "ROCjBbDQK9rNq82v"