register_check 表

src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs

@@ -62,9 +62,9 @@ namespace Shentun.Peis.ImportLisResults
         public Guid ExecOrganizationUnitId { get; set; }
 
         /// <summary>
-        /// lis审核医生
+        /// 审核医生
         /// </summary>
-        public string LisAuditorDoctorName { get; set; }
+        public string AuditorName { get; set; }
 
         /// <summary>
         /// lis标本号

src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs

@@ -55,9 +55,9 @@ namespace Shentun.Peis.ImportLisResults
 
 
         /// <summary>
-        /// lis审核医生
+        /// 审核医生
         /// </summary>
-        public string LisAuditorDoctorName { get; set; }
+        public string AuditorName { get; set; }
 
         /// <summary>
         /// lis标本号

src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs

@@ -288,14 +288,20 @@ namespace Shentun.Peis.PrintReports
         public DateTime CheckDate { get; set; }
 
         /// <summary>
-        /// lis审核医生
+        /// lis审核医生 为了不报错，暂时保留
         /// </summary>
         public string LisAuditorDoctorName { get; set; }
 
         /// <summary>
-        /// lis审核医生签名
+        /// 审核医生签名
+        /// </summary>
+        public string AuditorNameSignUrl { get; set; }
+
+
+        /// <summary>
+        /// 审核医生
         /// </summary>
-        public string LisAuditorDoctorSignUrl { get; set; }
+        public string AuditorName { get; set; }
 
         /// <summary>
         /// lis标本号

src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs

@@ -184,5 +184,10 @@ namespace Shentun.Peis.RegisterChecks
         /// pacs dicom文件上传日期
         /// </summary>
         public string PacsUploadDate { get; set; }
+
+        /// <summary>
+        /// 检查类别
+        /// </summary>
+        public char CheckTypeFlag { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs

@@ -28,9 +28,9 @@ namespace Shentun.Peis.RegisterChecks
         public List<UpdateRegisterCheckSuggestionDetail> Suggestions { get; set; } = new List<UpdateRegisterCheckSuggestionDetail>();
 
         /// <summary>
-        /// lis审核医生
+        /// 审核医生
         /// </summary>
-        public string LisAuditorDoctorName { get; set; }
+        public string AuditorName { get; set; }
 
         /// <summary>
         /// lis标本号

src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs

@@ -203,7 +203,7 @@ namespace Shentun.Peis.ImportLisResults
                         lisRequestItem.registerCheck.CheckDoctorId = inputItem.CheckDoctorName;
                         lisRequestItem.registerCheck.CheckDate = inputItem.CheckDate;
                         lisRequestItem.registerCheck.ExecOrganizationUnitId = inputItem.ExecOrganizationUnitId;
-                        lisRequestItem.registerCheck.LisAuditorDoctorName = inputItem.LisAuditorDoctorName;
+                        lisRequestItem.registerCheck.AuditorName = inputItem.AuditorName;
                         lisRequestItem.registerCheck.LisSampleNo = inputItem.LisSampleNo;
                         registerChecks.Add(lisRequestItem.registerCheck);
                     }
@@ -264,7 +264,7 @@ namespace Shentun.Peis.ImportLisResults
 
                     }).ToList(),
                     LisSampleNo = registerCheck.LisSampleNo,
-                    LisAuditorDoctorName = registerCheck.LisAuditorDoctorName
+                    AuditorName = registerCheck.AuditorName
 
                 };
 
@@ -491,10 +491,10 @@ namespace Shentun.Peis.ImportLisResults
                 }
 
                 //转换审核医生ID
-                var lisAuditorDoctorUserId = (await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(userColumnReferenId, item.LisAuditorDoctorName)).FirstOrDefault();
+                var lisAuditorDoctorUserId = (await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(userColumnReferenId, item.AuditorName)).FirstOrDefault();
                 if (!string.IsNullOrWhiteSpace(lisAuditorDoctorUserId))
                 {
-                    item.LisAuditorDoctorName = lisAuditorDoctorUserId;
+                    item.AuditorName = lisAuditorDoctorUserId;
                 }
 
                 foreach (var codeValue in codeValues)
@@ -515,7 +515,7 @@ namespace Shentun.Peis.ImportLisResults
                         ResultStatusId = null,
                         Result = item.Result,
                         Unit = item.Unit,
-                        LisAuditorDoctorName = item.LisAuditorDoctorName,
+                        AuditorName = item.AuditorName,
                         LisSampleNo = item.LisSampleNo
                     };
                     inputDtoList.Add(inputDto);
@@ -609,7 +609,7 @@ namespace Shentun.Peis.ImportLisResults
                         lisRequestItem.registerCheck.CheckDoctorId = inputItem.CheckDoctorName;
                         lisRequestItem.registerCheck.CheckDate = inputItem.CheckDate;
                         lisRequestItem.registerCheck.ExecOrganizationUnitId = inputItem.ExecOrganizationUnitId;
-                        lisRequestItem.registerCheck.LisAuditorDoctorName = inputItem.LisAuditorDoctorName;
+                        lisRequestItem.registerCheck.AuditorName = inputItem.AuditorName;
                         lisRequestItem.registerCheck.LisSampleNo = inputItem.LisSampleNo;
                         registerChecks.Add(lisRequestItem.registerCheck);
                     }
@@ -670,7 +670,7 @@ namespace Shentun.Peis.ImportLisResults
 
                     }).ToList(),
                     LisSampleNo = registerCheck.LisSampleNo,
-                    LisAuditorDoctorName = registerCheck.LisAuditorDoctorName
+                    AuditorName = registerCheck.AuditorName
 
                 };
 
@@ -746,7 +746,7 @@ namespace Shentun.Peis.ImportLisResults
                         ResultStatusId = null,
                         Result = item.ItemResult,
                         Unit = "",
-                        LisAuditorDoctorName = "",
+                        AuditorName = "",
                         LisSampleNo = input.SampleNo
                     };
                     inputDtoList.Add(inputDto);

src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@@ -1255,18 +1255,18 @@ namespace Shentun.Peis.PrintReports
                 // medicalReportRegisterCheckDto.LisAuditorDoctorName = registerCheckRow.registerCheck.LisAuditorDoctorName;
 
                 //lis审核医生
-                var lisAuditorDoctorId = registerCheckRow.registerCheck.LisAuditorDoctorName;
-                if (!string.IsNullOrWhiteSpace(lisAuditorDoctorId))
+                var auditorNameId = registerCheckRow.registerCheck.AuditorName;
+                if (!string.IsNullOrWhiteSpace(auditorNameId))
                 {
-                    if (Guid.TryParse(lisAuditorDoctorId, out var lisAuditorDoctorIdGuid))
+                    if (Guid.TryParse(auditorNameId, out var auditorNameIdGuid))
                     {
-                        medicalReportRegisterCheckDto.LisAuditorDoctorName = _cacheService.GetSurnameAsync(lisAuditorDoctorIdGuid).Result;
-                        medicalReportRegisterCheckDto.LisAuditorDoctorSignUrl = _cacheService.GetUserSignAsync(lisAuditorDoctorIdGuid).Result;
+                        medicalReportRegisterCheckDto.AuditorName = _cacheService.GetSurnameAsync(auditorNameIdGuid).Result;
+                        medicalReportRegisterCheckDto.AuditorNameSignUrl = _cacheService.GetUserSignAsync(auditorNameIdGuid).Result;
                     }
                     else
                     {
-                        medicalReportRegisterCheckDto.LisAuditorDoctorName = lisAuditorDoctorId;
-                        medicalReportRegisterCheckDto.LisAuditorDoctorSignUrl = "";
+                        medicalReportRegisterCheckDto.AuditorName = auditorNameId;
+                        medicalReportRegisterCheckDto.AuditorNameSignUrl = "";
                     }
                 }
 

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

@@ -113,6 +113,7 @@ namespace Shentun.Peis.RegisterChecks
             var registerCheckEntity = (await _registerCheckRepository.GetQueryableAsync())
                 .Include(x => x.RegisterCheckAsbitems)
                 .ThenInclude(x => x.Asbitem)
+                .ThenInclude(x => x.ItemType)
                 .FirstOrDefault(f => f.Id == id);
 
             var registerCheckDto = new RegisterCheckDto
@@ -161,7 +162,8 @@ namespace Shentun.Peis.RegisterChecks
                 CriticalRangeValue = registerCheckEntity.CriticalRangeValue,
                 CriticalValueCreatorName = _cacheService.GetSurnameAsync(registerCheckEntity.CriticalValueCreatorId).GetAwaiter().GetResult(),
                 FollowUpCreatorName = _cacheService.GetSurnameAsync(registerCheckEntity.FollowUpCreatorId).GetAwaiter().GetResult(),
-                DiagnosisLevelId = registerCheckEntity.DiagnosisLevelId
+                DiagnosisLevelId = registerCheckEntity.DiagnosisLevelId,
+                CheckTypeFlag = registerCheckEntity.RegisterCheckAsbitems.FirstOrDefault().Asbitem.ItemType.CheckTypeFlag
             };
 
             return registerCheckDto;
@@ -359,8 +361,8 @@ namespace Shentun.Peis.RegisterChecks
                 input.CheckDoctorId = CurrentUser.Id.ToString();
             }
             _registerCheckManager.UpdateCheckDoctorAndDateAsync(patientRegister, registerCheck, input.CheckDoctorId, input.CheckDate, input.ExecOrganizationUnitId);
-            if (!string.IsNullOrWhiteSpace(input.LisAuditorDoctorName))
-                registerCheck.LisAuditorDoctorName = input.LisAuditorDoctorName;
+            if (!string.IsNullOrWhiteSpace(input.AuditorName))
+                registerCheck.AuditorName = input.AuditorName;
             if (!string.IsNullOrWhiteSpace(input.LisSampleNo))
                 registerCheck.LisSampleNo = input.LisSampleNo;
             //更新人员登记信息完成标志

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

@@ -280,10 +280,10 @@ namespace Shentun.Peis.Models
         public DateTime? PacsUploadDate { get; set; }
 
         /// <summary>
-        /// lis审核医生
+        /// 审核医生  原有lis_auditor_doctor_name  改名
         /// </summary>
-        [Column("lis_auditor_doctor_name")]
-        public string LisAuditorDoctorName { get; set; }
+        [Column("auditor_name")]
+        public string AuditorName { get; set; }
 
         /// <summary>
         /// lis标本号