Merge branch 'master' of http://140.143.162.39:3000/wxd/WebPeis0523

src/Shentun.WebPeis.Application/Persons/PersonAppService.cs

@@ -434,11 +434,11 @@ namespace Shentun.WebPeis.Persons
 
             var medicalHealthReportListResult = await CallAppServiceAsync<MedicalHealthReportListInputDto, MedicalHealthReportListDto>(baseAddress, reportListApiUrl, medicalHealthReportListInputDto, "post");
 
-            if (medicalHealthReportListResult.Code == 200
+            if (medicalHealthReportListResult.Code != 200
                 || medicalHealthReportListResult.Data.FirstOrDefault() == null
                 || medicalHealthReportListResult.Data.FirstOrDefault().ReportStatus != "1")
             {
-                throw new UserFriendlyException("没有报告单");
+                throw new UserFriendlyException("没有健康评估报告");
             }
 
             //报告单ID
@@ -447,15 +447,22 @@ namespace Shentun.WebPeis.Persons
             reportApiUrl = reportApiUrl + $"?resultId={resultId}"; //获取报告apiurl
 
             var medicalHealthReportResult = await CallAppServiceAsync<MedicalHealthReportDto, MedicalHealthReportDto>(baseAddress, reportApiUrl, null, "get");
-            if (medicalHealthReportResult.Code == 200
+            if (medicalHealthReportResult.Code != 200
                 || string.IsNullOrWhiteSpace(medicalHealthReportResult.Data)
                 )
             {
-                throw new UserFriendlyException("没有报告单");
+                throw new UserFriendlyException("没有健康评估报告");
             }
 
             string reportUrl = medicalHealthReportResult.Data;
 
+
+            if (reportUrl.IndexOf(baseAddress) == -1)
+            {
+                //替换路径为代理地址
+                reportUrl = reportUrl.Replace("http://", "").Replace("https://", "");
+                reportUrl = baseAddress + reportUrl.Substring(reportUrl.IndexOf('/'));
+            }
             var returnValue = new MedicalReportDto()
             {
                 FilePath = reportUrl,