From 8cccb5da36bc92abd0f6512468c33ad19c0c9bf3 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 5 Dec 2023 11:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=87=B4=E6=80=A7?=
 =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E5=9B=BD=E9=99=85=E5=8C=96=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/appsettings.Test_IRC.json     | 11 ----------
 .../ConsistencyVerificationHandler.cs         | 21 +++++++++++++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

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($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_EdcL")} </div>");
                                 }
@@ -261,9 +261,22 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
                             dialogMsg.AppendLine($"<br/>");
                             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} ")) + "  |  "
-                              + 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")}"));
+                            }
+
+
                             //新增一致性核查质疑记录