From e1632b58ac4d7b0c3ef7a66fdff071c601fe4a12 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 3 Dec 2025 16:21:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?lugano=20=E9=95=BF=E7=9F=AD=E7=BB=8F?= =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/Export/TumorExportService.cs | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs index 21a563927..dd8ce3cd5 100644 --- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs @@ -514,7 +514,7 @@ public class Tumor_CDISC_ExportService(IRepository t.VisitNum == OncologyResult?.VisitTaskNum && t.SubjectCode==task.SubjectCode).FirstOrDefault(); + var visitTask = taskList.Where(t => t.VisitNum == OncologyResult?.VisitTaskNum && t.SubjectCode == task.SubjectCode).FirstOrDefault(); var rs = CreatNewRSExport(task, rs_subjectIndexNoDic); @@ -547,7 +547,7 @@ public class Tumor_CDISC_ExportService(IRepository t.QuestionMark == QuestionMark.State)?.QuestionValue == "3") + { + + lessionAnswer.QuestionValue = "0"; + } + } + //有值 就展示，没值就不展示 + else if (lesion.LessionType == LesionType.NonTargetLesions || lesion.LessionType == LesionType.NewLesions) + { + + if (lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.ShortAxis)?.QuestionValue.IsNotNullOrEmpty() == true + || lesion.LessionAnswerList.FirstOrDefault(t => t.QuestionMark == QuestionMark.MajorAxis)?.QuestionValue.IsNotNullOrEmpty() == true) + { + + } + else + { + trValueTypeIndex = -1; + } + + } + else + { + trValueTypeIndex = -1; + } + } + return trValueTypeIndex; From b38259576728054995b9271dfa851af17bb6b4a0 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 3 Dec 2025 17:53:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9EA=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 15 +++++++++++++++ .../Service/Document/TrialDocumentService.cs | 8 +++++++- .../Interface/IGeneralCalculateService.cs | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 97d03f47e..166f4701e 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -3757,6 +3757,12 @@ + + + 复制既往新病灶答案 + + + 从上传文件中获取Datatable @@ -6838,6 +6844,15 @@ + + + 复制历史答案到当前任务 + + + + + + 获取ReadingCalculateDto diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index bb9bccb2b..06de4dcf3 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -906,6 +906,12 @@ namespace IRaCIS.Core.Application.Services //EA 只能查看内部人员文档 var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA; + //EA 但是没有在进行的培训记录查看权限，那么返回空数据 + if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing && t.AuditRecordIdentityUserList.Any(c => c.IdentityUserId == _userInfo.IdentityUserId))) + { + return ResponseOutput.Ok(); + } + var list = _systemDocConfirmedUserRepository.Where(t => t.ConfirmTime != null) .WhereIf(isEA, t => t.ConfirmUser.IsZhiZhun == true) .Select(t => new { t.ConfirmUserId, t.ConfirmUser.UserName, t.ConfirmUser.FullName }).Distinct().ToList(); @@ -922,7 +928,7 @@ namespace IRaCIS.Core.Application.Services var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA; //EA 但是没有在进行的培训记录查看权限，那么返回空数据 - if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing)) + if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing && t.AuditRecordIdentityUserList.Any(c=>c.IdentityUserId==_userInfo.IdentityUserId))) { return ResponseOutput.Ok(new PageOutput()); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs index a1cf755b6..b9f340c7f 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IGeneralCalculateService.cs @@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service /// /// - Task CopyHistoryAnswer(VisitTask taskinfo, List tableRowList, List tableAnswerList) + Task CopyHistoryAnswer(VisitTask taskinfo, List tableRowList, List tableAnswerList); /// /// 获取ReadingCalculateDto From d224b519f78c9407b9154b764051e6f13f32ffdc Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 4 Dec 2025 10:19:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=B0=83=E7=A0=94=E8=BF=94=E5=9B=9E=E9=85=8D=E7=BD=AE=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/SiteSurvey/TrialSiteSurveyService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 656a49355..6ad158993 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -776,7 +776,7 @@ namespace IRaCIS.Core.Application.Contracts .ProjectTo(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).FirstOrDefaultAsync().IfNullThrowException(); } - var siteSurveryConfig = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).IgnoreQueryFilters().Select(t => t.Trial.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty; + var siteSurveryConfig = _trialRepository.Where(t=>t.Id==trialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty; result.SiteSurveyFiledConfig = JsonConvert.DeserializeObject(siteSurveryConfig) ?? new TrialExtraConfig(); return result;