XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

返回后台文件测试
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-10-10 12:37:19 +08:00
parent 1bb62fd134
commit 2527d709fa
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.API/Progranm.cs
View File

@ -289,6 +289,8 @@ app.UseStatusCodePages(async context =>
#endregion
app.UseIRacisHostStaticFileStore(env);
//本地化
app.UseLocalization();

32
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -684,7 +684,7 @@
<summary>
PM阅片跟踪
</summary>
<param name="queryVisitTask"></param>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>
@ -747,7 +747,7 @@
<summary>
自身一致性分析(仅做了resist1.1)
</summary>
<param name="queryVisitTask"></param>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>
@ -757,7 +757,7 @@
<summary>
组件一致性分析(仅做了resist1.1)
</summary>
<param name="queryVisitTask"></param>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>
@ -774,7 +774,7 @@
<summary>
整体肿瘤评估 （目前仅仅 RECIST1.1 多个标准一个接口 Excel 列是一样的 ）
</summary>
<param name="queryVisitTask"></param>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>
@ -784,7 +784,7 @@
<summary>
肿瘤疗效评估表 ( 目前仅仅 RECIST1.1)
</summary>
<param name="queryVisitTask"></param>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>
@ -795,7 +795,27 @@
<summary>
评估病灶明细表 (目前仅仅 RECIST1.1 RECIST1.1 PGW3 表都是不同的)
</summary>
<param name="queryVisitTask"></param>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetCommonJudgeEvaluationList_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
裁判阅片明细表
</summary>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetCommonEvaluationDetailList_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary>
阅片结果明细表
</summary>
<param name="inQuery"></param>
<param name="_commonDocumentRepository"></param>
<param name="_dictionaryService"></param>
<param name="_trialRepository"></param>

10
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -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);