Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

2025-12-04 14:16:50 +08:00
parent 6fcb670a89 d224b519f7
commit 8a9afc2d9a
5 changed files with 61 additions and 8 deletions
@@ -514,7 +514,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                {
                    if (OncologyResult.OncologyReason.IsNotNullOrEmpty())
                    {
-                        
+
                        var co = CreatNewCOExport(task, coList.Count + 1);

                        co.RemarksQuote = $"{OncologyResult?.VisitName}_ONCOLOGY_COMMENTS";
@@ -525,7 +525,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial

                        co.Remarks = OncologyResult.OncologyReason;

-                        
+

                        co.CODTC = task.SignTime?.ToString("yyyy-MM-dd");

@@ -535,7 +535,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                    if (OncologyResult.OncologyResult.IsNotNullOrEmpty())
                    {

-                        var visitTask = taskList.Where(t => 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<ReadingQuestionCriterionTrial

                        rs.LatestScanDate = visitTask?.LatestScanDate;
                        rs.EarliestScanDate = visitTask?.EarliestScanDate;
-                    
+

                        Fill_RS_IndexValue(rs, 9, Lugano_RSFixed.RSValueList);

@@ -781,7 +781,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial

                        rsValueList = RESIST_RSFixed.RSValueList;

-                        overallPD = "PD"; 
+                        overallPD = "PD";

                    }
                    else if (criterion.CriterionType == CriterionType.Lugano2014)
@@ -1205,6 +1205,38 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
            }
        }

+        if (trValueTypeIndex == 0 || trValueTypeIndex == 1)
+        {
+            if (lesion.LessionType == LesionType.TargetLesion)
+            {
+                //处理消失 空为0mm
+                if (lessionAnswer.QuestionValue.IsNullOrEmpty() && lesion.LessionAnswerList.FirstOrDefault(t => 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;


@@ -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<UnionDocumentWithConfirmInfoView>());
            }
@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service
        /// <param name="tableAnswerList"></param>
        /// <returns></returns>

-        Task CopyHistoryAnswer(VisitTask taskinfo, List<ReadingTableAnswerRowInfo> tableRowList, List<ReadingTableQuestionAnswer> tableAnswerList)
+        Task CopyHistoryAnswer(VisitTask taskinfo, List<ReadingTableAnswerRowInfo> tableRowList, List<ReadingTableQuestionAnswer> tableAnswerList);

        /// <summary>
        /// 获取ReadingCalculateDto
@@ -776,7 +776,7 @@ namespace IRaCIS.Core.Application.Contracts
              .ProjectTo<LoginReturnDTO>(_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<TrialExtraConfig>(siteSurveryConfig) ?? new TrialExtraConfig();
            return result;