diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs
index 5403af7fe..eafdfa1cd 100644
--- a/IRaCIS.Core.API/Progranm.cs
+++ b/IRaCIS.Core.API/Progranm.cs
@@ -289,6 +289,8 @@ app.UseStatusCodePages(async context =>
#endregion
+app.UseIRacisHostStaticFileStore(env);
+
//本地化
app.UseLocalization();
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 9e3c1cadd..470aaf1ad 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -684,7 +684,7 @@
PM阅片跟踪
-
+
@@ -747,7 +747,7 @@
自身一致性分析(仅做了resist1.1)
-
+
@@ -757,7 +757,7 @@
组件一致性分析(仅做了resist1.1)
-
+
@@ -774,7 +774,7 @@
整体肿瘤评估 (目前仅仅 RECIST1.1 多个标准一个接口 Excel 列是一样的 )
-
+
@@ -784,7 +784,7 @@
肿瘤疗效评估表 ( 目前仅仅 RECIST1.1)
-
+
@@ -795,7 +795,27 @@
评估病灶明细表 (目前仅仅 RECIST1.1 RECIST1.1 PGW3 表都是不同的)
-
+
+
+
+
+
+
+
+
+ 裁判阅片明细表
+
+
+
+
+
+
+
+
+
+ 阅片结果明细表
+
+
diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 2e3b50fef..b04eebac5 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -2290,7 +2290,7 @@ namespace IRaCIS.Core.Application.Service.Common
.GroupBy(t => new { t.SubjectId, t.DoctorUserId, t.SourceSubjectVisitId })
.Where(g => g.Count() == 2).Select(g => g.Key.SourceSubjectVisitId).Distinct().Count();
- exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge).Count();
+ exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count();
//3、裁判认同数M:触发裁判的受试者访视中,阅片人被裁判认同的访视数量;
//4、总裁判数N:阅片人所阅的受试者访视中,触发裁判的访视数量;
@@ -2304,7 +2304,7 @@ namespace IRaCIS.Core.Application.Service.Common
FullName = g.Key.FullName,
//访视产生裁判的访视数量
- TotalJudgeCount = g.Where(t => t.JudgeVisitTaskId != null).Count(),
+ TotalJudgeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
JudgeAgreeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.JudgeResultTaskId == t.Id).Count(),
@@ -2337,7 +2337,7 @@ namespace IRaCIS.Core.Application.Service.Common
&& t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter).Any(t => t.ReadingCategory == ReadingCategory.Judge)
).Count();
- var doctorList = _visitTaskRepository.Where(comonTaskFilter)
+ var doctorList = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
.GroupBy(t => new { t.DoctorUserId, t.DoctorUser.UserName, t.DoctorUser.FullName })
.Select(g => new DoctorJudgeRatio()
{
@@ -2369,7 +2369,7 @@ namespace IRaCIS.Core.Application.Service.Common
//3、裁判认同数J:触发裁判的阅片期中,阅片人被裁判认同的阅片期数量;
//4、总裁判数Q:阅片人完成阅片的阅片期中,触发裁判的阅片期数量;
- var doctor2List = _visitTaskRepository.Where(comonTaskFilter)
+ var doctor2List = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
.GroupBy(t => new { t.DoctorUserId, t.DoctorUser.UserName, t.DoctorUser.FullName })
.Where(g => g.Any(t => t.ReadingCategory == ReadingCategory.Global && t.JudgeVisitTaskId != null))
.Select(g => new DoctorJudgeRatio()
@@ -2388,9 +2388,9 @@ namespace IRaCIS.Core.Application.Service.Common
#endregion
+ exportInfo.DoctorSubjectStatList = doctorList;
exportInfo.DoctorPeriodStatList = doctor2List;
- exportInfo.DoctorSubjectStatList = doctorList;
return await ExcelExportHelper.DataExportAsync(StaticData.Export.ReadingPeriodJudgeRatio_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment);