diff --git a/src/Shentun.WebPeis.Application/Persons/PersonAppService.cs b/src/Shentun.WebPeis.Application/Persons/PersonAppService.cs index 802f5c5..78c43a3 100644 --- a/src/Shentun.WebPeis.Application/Persons/PersonAppService.cs +++ b/src/Shentun.WebPeis.Application/Persons/PersonAppService.cs @@ -434,11 +434,11 @@ namespace Shentun.WebPeis.Persons var medicalHealthReportListResult = await CallAppServiceAsync(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(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; + 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,