diff --git a/IRC.Core.SCP/appsettings.Uat_IRC_SCP.json b/IRC.Core.SCP/appsettings.Uat_IRC_SCP.json index 2d2fa6c9e..e7d327ed3 100644 --- a/IRC.Core.SCP/appsettings.Uat_IRC_SCP.json +++ b/IRC.Core.SCP/appsettings.Uat_IRC_SCP.json @@ -12,18 +12,18 @@ "RegionId": "cn-shanghai", "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com", "EndPoint": "https://oss-cn-shanghai.aliyuncs.com", - "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm", - "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV", - "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access", - "BucketName": "zy-irc-uat-store", - "ViewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com", + "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y", + "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T", + "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access", + "BucketName": "tl-med-irc-uat-store", + "ViewEndpoint": "https://tl-med-irc-uat-store.oss-cn-shanghai.aliyuncs.com", "Region": "oss-cn-shanghai", "DurationSeconds": 7200 } }, "ConnectionStrings": { - "RemoteNew": "Server=47.117.164.182,1434;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", - "Hangfire": "Server=47.117.164.182,1434;Database=Uat_IRC.Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" + "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", + "Hangfire": "Server101.132.253.119,1435;Database=Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" }, "DicomSCPServiceConfig": { "CalledAEList": [ diff --git a/IRaCIS.Core.API/appsettings.Uat_IRC.json b/IRaCIS.Core.API/appsettings.Uat_IRC.json index f591b3e19..f09694e24 100644 --- a/IRaCIS.Core.API/appsettings.Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.Uat_IRC.json @@ -7,8 +7,8 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=47.117.164.182,1434;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", - "Hangfire": "Server=47.117.164.182,1434;Database=Uat_IRC.Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" + "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", + "Hangfire": "Server=101.132.253.119,1435;Database=Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" }, "ObjectStoreService": { @@ -18,11 +18,11 @@ "RegionId": "cn-shanghai", "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com", "EndPoint": "https://oss-cn-shanghai.aliyuncs.com", - "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm", - "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV", - "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access", - "BucketName": "zy-irc-uat-store", - "ViewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com", + "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y", + "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T", + "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access", + "BucketName": "tl-med-irc-uat-store", + "ViewEndpoint": "https://tl-med-irc-uat-store.oss-cn-shanghai.aliyuncs.com", "Region": "oss-cn-shanghai", "DurationSeconds": 7200 }, diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index f1559db0e..03a7dbd43 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1502,11 +1502,25 @@ namespace IRaCIS.Core.Application.Service.Common } else { - //如果没有产生裁判，默认选择R1 - if (item.ArmEnum == Arm.DoubleReadingArm1) + //两个人都做了 + if (resultExceptJudgeList.Count(t => t.VisitTaskNum == item.VisitTaskNum && t.SubjectCode == item.SubjectCode) == 2) { - item.IsJudgeSelect = true; + //如果没有产生裁判，默认选择R1 + if (item.ArmEnum == Arm.DoubleReadingArm1) + { + item.IsJudgeSelect = true; + } + else + { + item.IsJudgeSelect = false; + } } + else + { + item.IsJudgeSelect = null; + item.IsTrigerJudge = null; + } + } } @@ -1524,17 +1538,26 @@ namespace IRaCIS.Core.Application.Service.Common var maxFinishedJudge = judegeList.Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault(); - var maxNotFinishedJudge = judegeList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned).FirstOrDefault(); + var maxNotFinishedJudge = judegeList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault(); - //仅有一个未完成的全局裁判，那么都是null + + //n个裁判任务都未完成 if (maxFinishedJudge == null && maxNotFinishedJudge != null) { if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum) { visitItem.IsJudgeSelect = null; } + else + { + //大于当前未完成的全局裁判 后续 肯定是未知的 + visitItem.IsTrigerJudge = null; + visitItem.IsJudgeSelect = null; + } + + } - //全局裁判都完成了，那么以最后一次裁判选择的为准 + //n个全局裁判都完成了，那么以最后一次裁判选择的为准 else if (maxFinishedJudge != null && maxNotFinishedJudge == null) { if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum) @@ -1547,14 +1570,27 @@ namespace IRaCIS.Core.Application.Service.Common { visitItem.IsJudgeSelect = false; } + else + { + //裁判都完成的后续 没有其他裁判任务 肯定也是未知的 + visitItem.IsTrigerJudge = null; + visitItem.IsJudgeSelect = null; + } } else { //两个都不为null 肯定是不同的裁判 - //在完成裁判之后的，和未完成裁判之前的 - if (/*visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum &&*/ visitItem.VisitTaskNum > maxFinishedJudge.VisitTaskNum) + //在未完成裁判之后的 + if (visitItem.VisitTaskNum > maxNotFinishedJudge.VisitTaskNum) { + visitItem.IsTrigerJudge = null; + visitItem.IsJudgeSelect = null; + } + //完成裁判之后的 ，和未完成裁判之前的 + else if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum && visitItem.VisitTaskNum > maxFinishedJudge.VisitTaskNum) + { + visitItem.IsTrigerJudge = true; visitItem.IsJudgeSelect = null; } else if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum) @@ -1571,11 +1607,27 @@ namespace IRaCIS.Core.Application.Service.Common } else { - //不存在裁判 将R1设置 - if (visitItem.ArmEnum == Arm.DoubleReadingArm1) + //没有产生裁判 有可能一个人没做完，也有可能做完了没产生裁判 + //两个人都做了 + if (resultExceptJudgeList.Count(t => t.VisitTaskNum == visitItem.VisitTaskNum && t.SubjectCode == visitItem.SubjectCode) == 2) { - visitItem.IsJudgeSelect = true; + //不存在裁判 将R1设置 + if (visitItem.ArmEnum == Arm.DoubleReadingArm1) + { + visitItem.IsJudgeSelect = true; + } + else + { + visitItem.IsJudgeSelect = false; + } } + else + { + visitItem.IsJudgeSelect = null; + visitItem.IsTrigerJudge = null; + } + + } } } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 6f5393bca..0f5f04839 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1189,8 +1189,8 @@ namespace IRaCIS.Core.Application.Contracts //在当前访视触发裁判，或者在截止日期小于等于当前访视的阅片期触发裁判 - [DictionaryTranslateAttribute("YesOrNo")] - public bool IsTrigerJudge { get; set; } + [DictionaryTranslateAttribute("YesOrNoAudit")] + public bool? IsTrigerJudge { get; set; } //（如果是访视点裁判，则仅在所选阅片人对应访视 显示；如果是阅片期裁判，则在所选阅片人 阅片期内的所有访视 显示此原因） public string JudgeNote { get; set; } = string.Empty;