From 25263ec7093e77bed65fc9bd45db8363358c097a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Sun, 15 Jan 2023 14:20:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 20220103后端提示语.xlsx                       | Bin 17161 -> 17415 bytes
 IRaCIS.Core.Application/Resources/en-US.json  |   6 +-
 IRaCIS.Core.Application/Resources/zh-CN.json  |   5 +-
 .../Service/Management/UserService.cs         |   2 +-
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  16 ++++-
 .../Reading/Dto/ReadingQuestionViewModel.cs   |  15 ++++-
 .../SelfDefineCalculateService.cs             |  56 +++++++++++-------
 .../ReadingQuestionTrial.cs                   |   5 ++
 .../ReadingTableQuestionTrial.cs              |   7 ++-
 9 files changed, 84 insertions(+), 28 deletions(-)

diff --git a/20220103后端提示语.xlsx b/20220103后端提示语.xlsx
index 594b6bcf571908286ab0a5bcdaa108a99b45638b..6442fdec8d0607bf20ba4ef2bc90703229680a37 100644
GIT binary patch
delta 8882
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

delta 8669
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

diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json
index 060025d88..d1fe2dff8 100644
--- a/IRaCIS.Core.Application/Resources/en-US.json
+++ b/IRaCIS.Core.Application/Resources/en-US.json
@@ -229,7 +229,11 @@
   "MedicalReview_SaveQuestion": "Unable to perform the current operation, please save the medical review question first.",
   "MedicalReview_NeedSave": "Unable to perform the current operation, please save the medical review questions and conclusions first.",
   "MedicalReview_NotClosed": "The current operation cannot be performed, and the current medical inquiry conversation has not been closed.",
-  "MedicalReview_Finish": "The current medical review task has been completed"
+  "MedicalReview_Finish": "The current medical review task has been completed",
+  //UserService
+  "User_CheckNameOrPw": "Please check the username or password."
+
+
 
 
 
diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.Application/Resources/zh-CN.json
index 1f107f73c..2bb34c908 100644
--- a/IRaCIS.Core.Application/Resources/zh-CN.json
+++ b/IRaCIS.Core.Application/Resources/zh-CN.json
@@ -230,7 +230,10 @@
   "MedicalReview_SaveQuestion": "无法执行当前操作，请先保存医学审核问题。",
   "MedicalReview_NeedSave": "无法执行当前操作，请先保存医学审核问题和结论。",
   "MedicalReview_NotClosed": "无法执行当前操作，当前医学质询对话未关闭。",
-  "MedicalReview_Finish": "当前医学审核已做完。"
+  "MedicalReview_Finish": "当前医学审核已做完。",
+  //UserService
+  "User_CheckNameOrPw": "请检查用户名或者密码。"
+
 
 
 
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 73ee067cd..4db65f04c 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -608,7 +608,7 @@ namespace IRaCIS.Application.Services
 
                 if (loginDoctor == null)
                 {
-                    return ResponseOutput.NotOk("请检查用户名或者密码。", new LoginReturnDTO());
+                    return ResponseOutput.NotOk(_localizer["User_CheckNameOrPw"], new LoginReturnDTO());
 
                 }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index d007518b5..eeb1047ff 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -75,7 +75,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string BlindName { get; set; } = string.Empty;
 
-        public Guid RowId { get; set; }
+        public Guid? RowId { get; set; }
 
         public string SplitOrMergeLesionName { get; set; }
 
@@ -495,6 +495,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public QuestionMark? QuestionMark { get; set; }
 
+        public bool IsCopy { get; set; }
+
 
         /// <summary>
         /// 问题Id
@@ -585,6 +587,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
+    /// <summary>
+    /// 病灶Index
+    /// </summary>
+    public class lesionsIndexDto
+    {
+    
+
+        public Guid QuestionId { get; set; }
+
+        public List<decimal> Rowindexs { get; set; }
+    }
+
     public class TableAnsweRowInfo : ReadingTableAnswerRowInfo
     {
         public string SplitName { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index f1f58385c..7b03369a6 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -327,7 +327,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public string QuestionName { get; set; } = string.Empty;
 		public IsRequired IsRequired { get; set; }
 
-
+		/// <summary>
+		/// 复制病灶的时候 是否复制这个问题
+		/// </summary>
+		public bool IsCopy { get; set; } = false;
 
 		public int ShowOrder { get; set; }
 		public string TypeValue { get; set; } = string.Empty;
@@ -765,6 +768,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid ReadingQuestionCriterionTrialId { get; set; }
 
+		/// <summary>
+		/// 是否复制病灶
+		/// </summary>
+		public bool IsCopyLesions { get; set; } = false;
+
 		public Guid TrialId { get; set; }
 
 		/// <summary>
@@ -1600,6 +1608,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public Guid TrialId { get; set; }
 
+		/// <summary>
+		/// 是否复制病灶
+		/// </summary>
+		public bool IsCopyLesions { get; set; } = false;
+
 		/// <summary>
 		/// 全局阅片显示类型
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
index a79218b11..1d008bc83 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
@@ -107,6 +107,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var criterionId = visitTaskInfo.TrialReadingCriterionId;
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId).ToListAsync();
             var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == criterionId).OrderBy(x => x.ShowOrder).ToListAsync();
+
+            var lesionsIndexs = await _readingTableAnswerRowInfoRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).GroupBy(x => new { x.QuestionId }).Select(x => new lesionsIndexDto()
+            {
+                QuestionId = x.Key.QuestionId,
+                Rowindexs = x.Select(x => x.RowIndex).Distinct().OrderBy(x => x).ToList()
+
+            }).ToListAsync();
+
             var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
             var answers = await _readingTaskQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
@@ -191,19 +199,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     var rowlist = tableAnsweRowInfos.Where(x => x.QuestionId == question.QuestionId).OrderBy(x => x.RowIndex).ToList();
 
+                    question.Childrens = new List<ReadingReportDto>();
 
-                    question.Childrens = rowlist.Select(x => new ReadingReportDto()
+                    var rowoindexs = lesionsIndexs.Where(x => x.QuestionId == question.QuestionId).Select(x => x.Rowindexs.OrderBy(y => y).ToList()).FirstOrDefault();
+
+                    foreach (var rowoindex in rowoindexs)
                     {
-                        QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
-                        RowId=x.Id,
-                        SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
-                        SplitOrMergeType = x.SplitOrMergeType,
-                        LesionType = question.LesionType,
-                        IsCanEditPosition = x.IsCanEditPosition,
-                        RowIndex = x.RowIndex,
-                        BlindName = x.BlindName,
-                        ReportLayType = ReportLayType.Lesions,
-                    }).ToList();
+                        var rowinfo = rowlist.Where(x => x.RowIndex == rowoindex).FirstOrDefault();
+                        question.Childrens.Add(new ReadingReportDto()
+                        {
+                            QuestionName = question.OrderMark + rowoindex.GetLesionMark(),
+                            RowId = rowinfo?.Id,
+                            SplitOrMergeLesionName = rowinfo!=null? (rowinfo.MergeName.IsNullOrEmpty() ? rowinfo.SplitName : rowinfo.MergeName):string.Empty,
+                            SplitOrMergeType = rowinfo != null ? (rowinfo.SplitOrMergeType):null,
+                            LesionType = question.LesionType,
+                            IsCanEditPosition = rowinfo != null ? (rowinfo.IsCanEditPosition):false,
+                            RowIndex = rowoindex,
+                            BlindName = rowinfo != null ? rowinfo.BlindName : string.Empty,
+                            ReportLayType = ReportLayType.Lesions,
+                        });
+                    }
+
+                  
 
 
                     foreach (var row in question.Childrens)
@@ -336,7 +353,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         public async Task<AddTaskLesionAnswerFromLastTaskOutDto> AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto)
         {
             var visitTaskId = inDto.VisitTaskId;
-
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
 
             var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
@@ -358,7 +374,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
 
 
-                    var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId).Select(x => new CopyTableAnswerDto()
+                    var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId&&x.ReadingQuestionTrial.IsCopyLesions).Select(x => new CopyTableAnswerDto()
                     {
                         Answer = x.Answer,
                         QuestionId = x.QuestionId,
@@ -366,10 +382,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         QuestionMark = x.ReadingTableQuestionTrial.QuestionMark,
                         TableQuestionId = x.TableQuestionId,
                         RowIndex = x.RowIndex,
-                        TrialId = x.TrialId
+                        IsCopy=x.ReadingTableQuestionTrial.IsCopy,
+                        TrialId = x.TrialId,
                     }).ToListAsync();
 
-                    var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
+                    var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId&&x.ReadingQuestionTrial.IsCopyLesions).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
 
                     tableRowAnswers.ForEach(x =>
@@ -390,17 +407,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     });
 
-                    List<QuestionMark?> notNeedCopyMarks = new List<QuestionMark?>()
-                    {
-                         QuestionMark.MajorAxis,
-                         QuestionMark.ShortAxis,
-                         QuestionMark.State,
-                    };
+                  
 
                     var tableAnswers = copyTableAnswers.Select(x => new ReadingTableQuestionAnswer
                     {
                         Id = NewId.NextGuid(),
-                        Answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer,
+                        Answer = x.IsCopy ? x.Answer:string.Empty ,
                         QuestionId = x.QuestionId,
                         RowIndex = x.RowIndex,
                         RowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(x => x.Id).FirstOrDefault(),
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
index e520fe454..729de9cdb 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
@@ -230,6 +230,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string GroupEnName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 是否复制病灶
+		/// </summary>
+		public bool IsCopyLesions { get; set; } = false;
+
 		/// <summary>
 		/// 分页标准
 		/// </summary>
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
index 135f03fb6..1507fc301 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
@@ -193,7 +193,12 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("ReadingQuestionId")]
 		public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
 
-		
+		/// <summary>
+		/// 复制病灶的时候 是否复制这个问题
+		/// </summary>
+		public bool IsCopy { get; set; } = false;
+
+
 		[NotMapped]
 		public List<string> ParentTriggerValueList
 		{