From 059e55339c339e0653fe04ba47cc082d90655e51 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 31 Oct 2022 14:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrialSiteUser/TrialConfigService.cs       | 33 ++++++++++---------
 .../ReadingQuestionCriterionTrial.cs          |  4 +--
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 7b62b2473..5c7820014 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -171,6 +171,22 @@ namespace IRaCIS.Core.Application
                     x.CriterionId = inDto.TrialReadingCriterionId;
                 });
 
+                if (trialCriterion.SynchronizeOriginalTime == null )
+                {
+                    // 同步器官
+                    await _iOrganInfoService.SynchronizeSystemOrganToTrial(new SynchronizeSystemOrganToTrialInDto()
+                    {
+                        TrialReadingCriterionId = inDto.TrialReadingCriterionId,
+                        SystemCriterionId = trialCriterion.ReadingQuestionCriterionSystemId
+                    });
+
+                    // 同步问题
+                    await iReadingQuestionService.SynchronizeCriterion(new SynchronizeCriterionInDto()
+                    {
+
+                        TrialReadingCriterionId = inDto.TrialReadingCriterionId,
+                    });
+                }
                 await _readingCriterionDictionaryRepository.AddRangeAsync(criterionDictionaryList);
                 await _readingCriterionDictionaryRepository.SaveChangesAsync();
             }
@@ -360,22 +376,7 @@ namespace IRaCIS.Core.Application
                 result.FormType = trialCriterion.FormType;
                 result.IsFromSystem = trialCriterion.ReadingQuestionCriterionSystemId != null;
 
-                if (trialCriterion.SynchronizeOriginalTime == null && trialCriterion.ReadingQuestionCriterionSystemId != null)
-                {
-                    // 同步器官
-                    await _iOrganInfoService.SynchronizeSystemOrganToTrial(new SynchronizeSystemOrganToTrialInDto()
-                    {
-                        TrialReadingCriterionId = inDto.TrialReadingCriterionId,
-                        SystemCriterionId = trialCriterion.ReadingQuestionCriterionSystemId
-                    });
-
-                    // 同步问题
-                    await iReadingQuestionService.SynchronizeCriterion(new SynchronizeCriterionInDto()
-                    {
-
-                        TrialReadingCriterionId = inDto.TrialReadingCriterionId,
-                    });
-                }
+               
                 result.IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null;
             };
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
index f2aa83d67..110f0a399 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
@@ -120,7 +120,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 阅片平台 
 		/// </summary>
-		public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.MINT;
+		public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS;
 
 		/// <summary>
 		/// 阅片工具
@@ -154,7 +154,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 仲裁对象
 		/// </summary>
-		public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None;
+		public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading;
 
 
 		/// <summary>