From 5ae02e0d1f28616ae41affe47fa123ddc1f68478 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 10 Aug 2023 16:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E7=A0=94=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2trialId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Properties/launchSettings.json            | 24 ++++---------------
 .../SiteSurvey/TrialSiteUserSurveyService.cs  |  6 +++--
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json
index dbb6e2d78..a8d648f0a 100644
--- a/IRaCIS.Core.API/Properties/launchSettings.json
+++ b/IRaCIS.Core.API/Properties/launchSettings.json
@@ -30,31 +30,15 @@
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
       "publishAllPorts": true
     },
-    "IRaCIS.Staging": {
+    "Uat_Study": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Staging"
+        "ASPNETCORE_ENVIRONMENT": "Uat_Study"
       },
-      "applicationUrl": "http://localhost:6200"
+      "applicationUrl": "http://localhost:6100"
     },
-    "IRaCIS.Production": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Production"
-      },
-      "applicationUrl": "http://localhost:6300"
-    },
-    "IRaCIS.CertificateApply": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "CertificateApply"
-      },
-      "applicationUrl": "http://localhost:6400"
-    },
-    "IRaCIS.CenterImageDev": {
+    "Test_Study": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs
index 0a98f5078..9d4bce551 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs
@@ -18,10 +18,12 @@ namespace IRaCIS.Core.Application.Contracts
     public class TrialSiteUserSurveyService : BaseService, ITrialSiteUserSurveyService
     {
         private readonly IRepository<TrialSiteUserSurvey> _trialSiteUserSurveyRepository;
+        private readonly IRepository<TrialSiteSurvey> _trialSiteSurveyRepository;
 
-        public TrialSiteUserSurveyService(IRepository<TrialSiteUserSurvey> trialSiteUserSurveyRepository)
+        public TrialSiteUserSurveyService(IRepository<TrialSiteUserSurvey> trialSiteUserSurveyRepository, IRepository<TrialSiteSurvey> trialSiteSurveyRepository)
         {
             _trialSiteUserSurveyRepository = trialSiteUserSurveyRepository;
+            _trialSiteSurveyRepository = trialSiteSurveyRepository;
         }
 
         [HttpGet("{trialSiteSurveyId:guid}")]
@@ -50,7 +52,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             if (addOrEditTrialSiteUserSurvey.IsGenerateAccount  )
             {
-                var trialId= _trialSiteUserSurveyRepository.Where(t=>t.TrialSiteSurveyId == addOrEditTrialSiteUserSurvey.TrialSiteSurveyId).Select(t=>t.TrialSiteSurvey.TrialId).FirstOrDefault();
+                var trialId= _trialSiteSurveyRepository.Where(t=>t.Id == addOrEditTrialSiteUserSurvey.TrialSiteSurveyId).Select(t=>t.TrialId).FirstOrDefault();
 
                 var trialType = _repository.Where<Trial>(t => t.Id == trialId).Select(t => t.TrialType).FirstOrDefault();