diff --git a/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs b/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
index d0c00a9..916a4aa 100644
--- a/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
@@ -62,9 +62,9 @@ namespace Shentun.Peis.ImportLisResults
public Guid ExecOrganizationUnitId { get; set; }
///
- /// lis审核医生
+ /// 审核医生
///
- public string LisAuditorDoctorName { get; set; }
+ public string AuditorName { get; set; }
///
/// lis标本号
diff --git a/src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs b/src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs
index 450eda6..fa9e8cf 100644
--- a/src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs
@@ -55,9 +55,9 @@ namespace Shentun.Peis.ImportLisResults
///
- /// lis审核医生
+ /// 审核医生
///
- public string LisAuditorDoctorName { get; set; }
+ public string AuditorName { get; set; }
///
/// lis标本号
diff --git a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
index 98a53a2..6c3b94f 100644
--- a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
@@ -288,14 +288,20 @@ namespace Shentun.Peis.PrintReports
public DateTime CheckDate { get; set; }
///
- /// lis审核医生
+ /// lis审核医生 为了不报错，暂时保留
///
public string LisAuditorDoctorName { get; set; }
///
- /// lis审核医生签名
+ /// 审核医生签名
+ ///
+ public string AuditorNameSignUrl { get; set; }
+
+
+ ///
+ /// 审核医生
///
- public string LisAuditorDoctorSignUrl { get; set; }
+ public string AuditorName { get; set; }
///
/// lis标本号
diff --git a/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs
index 477a7e8..d96dd66 100644
--- a/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs
@@ -184,5 +184,10 @@ namespace Shentun.Peis.RegisterChecks
/// pacs dicom文件上传日期
///
public string PacsUploadDate { get; set; }
+
+ ///
+ /// 检查类别
+ ///
+ public char CheckTypeFlag { get; set; }
}
}
diff --git a/src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs
index 985772a..26400fb 100644
--- a/src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs
@@ -28,9 +28,9 @@ namespace Shentun.Peis.RegisterChecks
public List Suggestions { get; set; } = new List();
///
- /// lis审核医生
+ /// 审核医生
///
- public string LisAuditorDoctorName { get; set; }
+ public string AuditorName { get; set; }
///
/// lis标本号
diff --git a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs b/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
index f7b066c..8888e42 100644
--- a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
+++ b/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);
diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
index de0ff8e..ab13ff9 100644
--- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
+++ b/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 = "";
}
}
diff --git a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs b/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs
index ab6f16e..7ce24b7 100644
--- a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs
+++ b/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;
//更新人员登记信息完成标志
diff --git a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs
index ca51e14..3f91e1a 100644
--- a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs
+++ b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs
@@ -280,10 +280,10 @@ namespace Shentun.Peis.Models
public DateTime? PacsUploadDate { get; set; }
///
- /// lis审核医生
+ /// 审核医生 原有lis_auditor_doctor_name 改名
///
- [Column("lis_auditor_doctor_name")]
- public string LisAuditorDoctorName { get; set; }
+ [Column("auditor_name")]
+ public string AuditorName { get; set; }
///
/// lis标本号