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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2978,6 +2978,20 @@
             <param name="inCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.GetPatientInfo(IRaCIS.Core.Application.Contracts.GetPatientInfoInDto)">
+            <summary>
+            获取患者基本信息
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.EditPatientInfo(IRaCIS.Core.Application.Contracts.EditPatientInfoCommand)">
+            <summary>
+            编辑患者基本信息
+            </summary>
+            <param name="command"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.Preview(System.Guid)">
             <summary> 指定资源Id，渲染Dicom检查的Jpeg预览图像  </summary>
             <param name="studyId"> Dicom检查的Id </param>
@@ -17255,17 +17269,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            质疑
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            一致性核查
+            һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            复制
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
@@ -18386,6 +18400,66 @@
             ISystemDocumentService
             </summary>	
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.EditPatientInfoCommand.PatientSex">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.EditPatientInfoCommand.PatientWeight">
+            <summary>
+            体重
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.EditPatientInfoCommand.RadionuclideTotalDose">
+            <summary>
+            总剂量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.EditPatientInfoCommand.RadionuclideHalfLife">
+            <summary>
+            半衰期
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.EditPatientInfoCommand.RadiopharmaceuticalStartTime">
+            <summary>
+            注射时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.EditPatientInfoCommand.AcquisitionTime">
+            <summary>
+            成像 / 采集时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.PatientInfoDto.PatientSex">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.PatientInfoDto.PatientWeight">
+            <summary>
+            体重
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.PatientInfoDto.RadionuclideTotalDose">
+            <summary>
+            总剂量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.PatientInfoDto.RadionuclideHalfLife">
+            <summary>
+            半衰期
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.PatientInfoDto.RadiopharmaceuticalStartTime">
+            <summary>
+            注射时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.PatientInfoDto.AcquisitionTime">
+            <summary>
+            成像 / 采集时间
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.AddOrUpdateStudyDto.RadionuclideTotalDose">
             <summary>
             总剂量

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -194,6 +194,81 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class EditPatientInfoCommand
+    {
+        public Guid StudyId { get; set; }
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string PatientSex { get; set; } = null!;
+
+        /// <summary>
+        /// 体重
+        /// </summary>
+        public string PatientWeight { get; set; }
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; } = null!;
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; } = null!;
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; } = null!;
+
+        /// <summary>
+        /// 成像 / 采集时间
+        /// </summary>
+        public string AcquisitionTime { get; set; } = null!;
+    }
+
+    public class GetPatientInfoInDto
+    {
+        public Guid StudyId { get; set; }
+    }
+
+    public class PatientInfoDto
+    {
+
+        public Guid StudyId { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string PatientSex { get; set; } = null!;
+
+        /// <summary>
+        /// 体重
+        /// </summary>
+        public string PatientWeight { get; set; }
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; } = null!;
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; } = null!;
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; } = null!;
+
+        /// <summary>
+        /// 成像 / 采集时间
+        /// </summary>
+        public string AcquisitionTime { get; set; } = null!;
+    }
+
     public class PreArchiveDicomStudyCommand
     {
 

IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs

@@ -177,6 +177,41 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
         }
 
+        /// <summary>
+        /// 获取患者基本信息
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PatientInfoDto> GetPatientInfo(GetPatientInfoInDto inDto)
+        {
+            var study = await _dicomStudyRepository.Where(s => s.Id == inDto.StudyId).ProjectTo<PatientInfoDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            
+            return study;
+        }
+
+        /// <summary>
+        /// 编辑患者基本信息
+        /// </summary>
+        /// <param name="command"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> EditPatientInfo(EditPatientInfoCommand command)
+        {
+            await _dicomStudyRepository.UpdatePartialFromQueryAsync(command.StudyId, x => new DicomStudy
+            {
+                PatientSex = command.PatientSex,
+                PatientWeight = command.PatientWeight,
+                RadionuclideTotalDose = command.RadionuclideTotalDose,
+                RadionuclideHalfLife = command.RadionuclideHalfLife,
+                RadiopharmaceuticalStartTime = command.RadiopharmaceuticalStartTime,
+                AcquisitionTime = command.AcquisitionTime,
+            });
+            await _dicomStudyRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }
+
 
         [TrialGlobalLimit("AfterStopCannNotOpt")]
 
@@ -440,13 +475,13 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         {
                             await _dicomStudyRepository.UpdatePartialFromQueryAsync(t => t.Id == findStudy.Id, u => new DicomStudy()
                             {
-                                RadionuclideTotalDose = incommand.Study.RadionuclideTotalDose.IsNotNullOrEmpty()? incommand.Study.RadionuclideTotalDose : findStudy.RadionuclideTotalDose,
+                                RadionuclideTotalDose = incommand.Study.RadionuclideTotalDose.IsNotNullOrEmpty() ? incommand.Study.RadionuclideTotalDose : findStudy.RadionuclideTotalDose,
                                 RadionuclideHalfLife = incommand.Study.RadionuclideHalfLife.IsNotNullOrEmpty() ? incommand.Study.RadionuclideHalfLife : findStudy.RadionuclideHalfLife,
                                 RadiopharmaceuticalStartTime = incommand.Study.RadiopharmaceuticalStartTime.IsNotNullOrEmpty() ? incommand.Study.RadiopharmaceuticalStartTime : findStudy.RadiopharmaceuticalStartTime
                             });
                         }
 
-                       
+
 
                     }
 

IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs

@@ -25,6 +25,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AddInstanceDto, TaskInstance>();
 
+            CreateMap<DicomStudy, PatientInfoDto>();
+
 
             CreateMap<DicomSeries, DicomSeriesWithLabelDTO>();
 

IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs

@@ -276,6 +276,42 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string BodyPartForEditOther { get; set; }
 
+
+        #region 核验
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string PatientSex { get; set; } = null!;
+
+        /// <summary>
+        /// 体重
+        /// </summary>
+        public string PatientWeight { get; set; }
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; } = null!;
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; } = null!;
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; } = null!;
+
+        /// <summary>
+        /// 成像 / 采集时间
+        /// </summary>
+        public string AcquisitionTime { get; set; } = null!;
+
+
+        #endregion
+
         public List<DicomSeriesDTO> SeriesList { get; set; } = new List<DicomSeriesDTO>();
     }
 

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -589,7 +589,14 @@ namespace IRaCIS.Core.Application.Services
                     StudyId = k.Id,
 
                     BodyPartForEdit = k.BodyPartForEdit,
-                    BodyPartForEditOther = k.BodyPartForEditOther
+                    BodyPartForEditOther = k.BodyPartForEditOther,
+                    PatientSex=k.PatientSex,
+                    PatientWeight=k.PatientWeight,
+                    RadionuclideTotalDose=k.RadionuclideTotalDose,
+                    RadionuclideHalfLife=k.RadionuclideHalfLife,
+                    RadiopharmaceuticalStartTime=k.RadiopharmaceuticalStartTime,
+                    AcquisitionTime= k.AcquisitionTime,
+
 
 
                 }).ToListAsync();

IRaCIS.Core.Domain/Image/DicomStudy.cs

@@ -36,7 +36,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
 
     public string AcquisitionNumber { get; set; } = null!;
 
-    public string AcquisitionTime { get; set; } = null!;
+   
 
     public string BodyPartExamined { get; set; } = null!;
 
@@ -157,6 +157,10 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
     /// </summary>
     public string RadiopharmaceuticalStartTime { get; set; } = null!;
 
+    /// <summary>
+    /// 成像 / 采集时间
+    /// </summary>
+    public string AcquisitionTime { get; set; } = null!;
 
 
     #endregion