Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

IRC_NewDev
he 2023-11-09 15:53:04 +08:00
commit 7a7acfa15c
2 changed files with 39 additions and 10 deletions

View File

@ -113,13 +113,25 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
StringBuilder dialogMsg = new StringBuilder(); StringBuilder dialogMsg = new StringBuilder();
//---您好,根据本系统自动识别该受试者当前访视在IRC系统中已提交的影像检查情况如下 //---您好,根据本系统自动识别该受试者当前访视在IRC系统中已提交的影像检查情况如下
dialogMsg.Append(StaticData.International("ConsistencyVerification_Img")); dialogMsg.Append($"<div>{StaticData.International("ConsistencyVerification_Img")}</div>");
var num = 0; var num = 0;
List<ParamInfoDto> paramInfoList = new List<ParamInfoDto>(); List<ParamInfoDto> paramInfoList = new List<ParamInfoDto>();
foreach (var item in dbVisitStudyList) foreach (var item in dbVisitStudyList)
{ {
num++; num++;
dialogMsg.AppendLine($"<span style='text-indent: 20px;'><br>{num}. {item.StudyDate} {(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
if (_userInfo.IsEn_Us)
{
dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")}</div>");
}
else
{
dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}</div>");
}
paramInfoList.Add(new ParamInfoDto() paramInfoList.Add(new ParamInfoDto()
{ {
Modality = item.Modality, Modality = item.Modality,
@ -205,9 +217,8 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
// ETC 和系统的有区别 // ETC 和系统的有区别
else else
{ {
dialogMsg.AppendLine($"<br/>"); //"Problems are as follows:
//存在问题如下: dialogMsg.AppendLine($"<br/><div style='color: #f00'>{StaticData.International("ConsistencyVerification_Prob")}</div>");
dialogMsg.AppendLine($"<br><span style='color: #f00'>{StaticData.International("ConsistencyVerification_Prob")}</span>");
num = 0; num = 0;
foreach (var item in dbExceptExcel) foreach (var item in dbExceptExcel)
@ -215,8 +226,16 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
num++; num++;
//影像检查(EDC 缺少) ConsistencyVerification_EdcL //影像检查(EDC 缺少) ConsistencyVerification_EdcL
if (_userInfo.IsEn_Us)
{
dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_EdcL")} </div>");
}
else
{
dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {StaticData.International("ConsistencyVerification_EdcL")}{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}</div>");
}
dialogMsg.AppendLine($"<span style='text-indent: 20px;'><br>{num}. {StaticData.International("ConsistencyVerification_EdcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
} }
@ -225,12 +244,22 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
num++; num++;
// 影像检查(IRC 缺少) // 影像检查(IRC 缺少)
dialogMsg.AppendLine($"<span style='text-indent: 20px;'><br>{num}. {StaticData.International("ConsistencyVerification_IrcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
if (_userInfo.IsEn_Us)
{
dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_IrcL")}</div>");
}
else
{
dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {StaticData.International("ConsistencyVerification_IrcL")}{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}</div>");
}
} }
dialogMsg.AppendLine($"<br/>"); dialogMsg.AppendLine($"<br/>");
dialogMsg.AppendLine(@$"<br>{StaticData.International("ConsistencyVerification_Desc")}"); dialogMsg.AppendLine(@$"<div>{StaticData.International("ConsistencyVerification_Desc")}<div/>");
//---根据导入的一致性核查数据,请确认本访视以下不一致检查项信息: //---根据导入的一致性核查数据,请确认本访视以下不一致检查项信息:
dbSV.CheckResult = StaticData.International("ConsistencyVerification_Conf") + String.Join(" | ", dbExceptExcel.Select(t => $"{StaticData.International("ConsistencyVerification_Edc")}{t.StudyDate} {t.Modality} ")) + " | " dbSV.CheckResult = StaticData.International("ConsistencyVerification_Conf") + String.Join(" | ", dbExceptExcel.Select(t => $"{StaticData.International("ConsistencyVerification_Edc")}{t.StudyDate} {t.Modality} ")) + " | "