修改

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -345,6 +345,23 @@ public static class FileStoreHelper
 
     }
 
+    public static (string PhysicalPath, string RelativePath, string FileRealName) GetMedicalReviewImage(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid taskMedicalReviewId)
+    {
+        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+
+        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), taskMedicalReviewId.ToString(), StaticData.Folder.NoneDicomFolder);
+
+        if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
+
+        var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
+
+
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{taskMedicalReviewId}/{StaticData.Folder.NoneDicomFolder}/{trustedFileNameForFileStorage}";
+
+        var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
+
+        return (serverFilePath, relativePath, fileRealName);
+    }
 
     //获取非dicom文件存放路径
     public static (string PhysicalPath, string RelativePath, string FileRealName) GetNoneDicomFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteId, Guid subjectId, Guid subjectVisitId)

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

@@ -1472,6 +1472,16 @@
             答案
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewReadingTaskOutDto.IsReviewFinish">
+            <summary>
+            是否完成
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewReadingTaskOutDto.IsClosedDialog">
+            <summary>
+            是否关闭
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SaveMedicalReviewInfoInDto.IsHaveQuestion">
             <summary>
             是否有问题
@@ -1492,12 +1502,7 @@
             审核建议
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SaveMedicalReviewInfoInDto.IsFinish">
-            <summary>
-            是否完成
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SaveMedicalReviewInfoInDto.IsClosed">
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SaveMedicalReviewInfoInDto.IsClosedDialog">
             <summary>
             是否关闭
             </summary>
@@ -1522,12 +1527,12 @@
             审核建议
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MedicalReviewInfo.IsFinish">
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MedicalReviewInfo.IsReviewFinish">
             <summary>
             是否完成
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MedicalReviewInfo.IsClosed">
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MedicalReviewInfo.IsClosedDialog">
             <summary>
             是否关闭
             </summary>

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs

@@ -12,9 +12,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class SendMedicalReviewDialogInDto
     {
         public Guid TaskMedicalReviewId { get; set; }
-
-        public Guid VisitTaskId { get; set; }
-
         public string Content { get; set; }
     }
 
@@ -65,7 +62,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 是否关闭
         /// </summary>
-        public bool IsClosedDialo { get; set; }
+        public bool IsClosedDialog { get; set; }
 
         public List<TaskInfo> TaskList { get; set; } = new List<TaskInfo>();
 
@@ -103,15 +100,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public AuditAdvice AuditAdviceEnum { get; set; }
 
-        /// <summary>
-        /// 是否完成
-        /// </summary>
-        public bool IsReviewFinish { get; set; }
-
         /// <summary>
         /// 是否关闭
         /// </summary>
-        public bool IsClosedDialo { get; set; }
+        public bool IsClosedDialog { get; set; }
     }
 
     public class MedicalReviewInfo 
@@ -148,7 +140,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 是否关闭
         /// </summary>
-        public bool IsClosedDialo { get; set; }
+        public bool IsClosedDialog { get; set; }
     }
 
     public class ReadingMedicineQuestion 
@@ -224,6 +216,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string TaskName { get; set; }
 
+        /// <summary>
+        /// 是否有全局更新
+        /// </summary>
+        public bool IsGlobalChange { get; set; }
+
         /// <summary>
         /// 盲态名称
         /// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs

@@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
 
             medicalReviewInfo.VisitTaskId = taskInfo.Id;
             medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
-            medicalReviewInfo.IsClosedDialo = medicalReviewInfo.MedicalReviewInfo.IsClosedDialo;
+            medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog;
             medicalReviewInfo.IsReviewFinish = medicalReviewInfo.MedicalReviewInfo.IsReviewFinish;
 
 
@@ -250,8 +250,7 @@ namespace IRaCIS.Core.Application.Service
                 Questioning = inDto.Questioning,
                 ImagePath = inDto.ImagePath,
                 AuditAdviceEnum = inDto.AuditAdviceEnum,
-                IsReviewFinish = inDto.IsReviewFinish,
-                IsClosedDialo = inDto.IsClosedDialo
+                IsClosedDialog = inDto.IsClosedDialog
             });
 
             var result = await _taskMedicalReviewRepository.SaveChangesAsync();
@@ -265,13 +264,14 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public  async Task<IResponseOutput> SendMedicalReviewDialog(SendMedicalReviewDialogInDto inDto)
         {
+            var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
             ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
             {
                 TaskMedicalReviewId = inDto.TaskMedicalReviewId,
                 UserTypeShortName = _userInfo.UserTypeShortName,
                 Content = inDto.Content,
                 UserTypeEnumInt = _userInfo.UserTypeEnumInt,
-                VisitTaskId = inDto.VisitTaskId,
+                VisitTaskId = visitTaskId,
             };
 
             await _readingMedicalReviewDialogRepository.AddAsync(dialog);
@@ -281,6 +281,9 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+        //public async Task<IResponseOutput> 
+
+
      
     }
 }