diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json index 1563831a3..e75753b45 100644 --- a/IRaCIS.Core.API/appsettings.Test_IRC.json +++ b/IRaCIS.Core.API/appsettings.Test_IRC.json @@ -37,17 +37,6 @@ } }, - "AliyunOSS": { - "RegionId": "cn-shanghai", - "Endpoint": "https://oss-cn-shanghai.aliyuncs.com", - "AccessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ", - "AccessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio", - "BucketName": "zy-irc-test-store", - "RoleArn": "acs:ram::1899121822495495:role/oss-upload", - "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com", - "Region": "oss-cn-shanghai" - }, - "BasicSystemConfig": { "OpenUserComplexPassword": false, diff --git a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs index 0373eef90..b1f7858c7 100644 --- a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs +++ b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs @@ -226,7 +226,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers num++; //影像检查(EDC 缺少) ConsistencyVerification_EdcL - if (_userInfo.IsEn_Us) + if (_userInfo.IsEn_Us) { dialogMsg.AppendLine($"
{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_EdcL")}
"); } @@ -261,9 +261,22 @@ namespace IRaCIS.Core.Application.MediatR.Handlers dialogMsg.AppendLine($"
"); dialogMsg.AppendLine(@$"
{StaticData.International("ConsistencyVerification_Desc")}
"); - //---根据导入的一致性核查数据,请确认本访视以下不一致检查项信息: - dbSV.CheckResult = StaticData.International("ConsistencyVerification_Conf") + String.Join(" | ", dbExceptExcel.Select(t => $"{StaticData.International("ConsistencyVerification_Edc")}{t.StudyDate} {t.Modality} ")) + " | " - + String.Join(" | ", excelExceptDB.Select(t => $"{StaticData.International("ConsistencyVerification_IrcLi")}{t.StudyDate} {t.Modality}")); + if (_userInfo.IsEn_Us) + { + //---根据导入的一致性核查数据,请确认本访视以下不一致检查项信息: + dbSV.CheckResult = StaticData.International("ConsistencyVerification_Conf") + + String.Join(" | ", dbExceptExcel.Select(t => $"{t.StudyDate} {t.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_Edc")}")) + " | " + + String.Join(" | ", excelExceptDB.Select(t => $"{t.StudyDate} {t.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_IrcLi")}")); + } + else + { + //---根据导入的一致性核查数据,请确认本访视以下不一致检查项信息: + dbSV.CheckResult = StaticData.International("ConsistencyVerification_Conf") + + String.Join(" | ", dbExceptExcel.Select(t => $"{StaticData.International("ConsistencyVerification_Edc")}{t.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{t.Modality}{StaticData.International("ConsistencyVerification_ImgC")}")) + " | " + + String.Join(" | ", excelExceptDB.Select(t => $"{StaticData.International("ConsistencyVerification_IrcLi")}{t.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{t.Modality}{StaticData.International("ConsistencyVerification_ImgC")}")); + } + + //新增一致性核查质疑记录