|
@@ -4,6 +4,7 @@ using System.IO;
|
|
|
using System.Linq;
|
|
|
using System.Net.Http;
|
|
|
using System.Threading.Tasks;
|
|
|
+using Newtonsoft.Json;
|
|
|
using Newtonsoft.Json.Linq;
|
|
|
using WingInterfaceLibrary.DTO.Vital;
|
|
|
using WingInterfaceLibrary.Enum.VitalEnum;
|
|
@@ -198,6 +199,15 @@ public class ElectrocardiogramService : JsonRpcService, IVitalElectrocardiogramS
|
|
|
if (string.IsNullOrEmpty(record?.OrganizationName))
|
|
|
{
|
|
|
record.OrganizationName = orgInfo.OrganizationName;
|
|
|
+ }
|
|
|
+ EcgExamDataModel ecgExamData = null;
|
|
|
+ try
|
|
|
+ {
|
|
|
+ ecgExamData = JsonConvert.DeserializeObject<EcgExamDataModel>(request.ExamData);
|
|
|
+ }
|
|
|
+ catch
|
|
|
+ {
|
|
|
+
|
|
|
}
|
|
|
if (!string.IsNullOrEmpty(userReport?.ReportCode))
|
|
|
{
|
|
@@ -208,7 +218,8 @@ public class ElectrocardiogramService : JsonRpcService, IVitalElectrocardiogramS
|
|
|
PatientName = userInfo.UserName,
|
|
|
ReportTemplateCode = reportTemplateCode,
|
|
|
ReportCode = userReport.ReportCode,
|
|
|
- Token = request.Token
|
|
|
+ Token = request.Token,
|
|
|
+ HealthDiagnosis = ecgExamData?.HealthDiagnosis ?? 0,
|
|
|
};
|
|
|
//修改报告
|
|
|
res = await _ultrasoundReportService.VitalModifyEcgReportAsync(modifyRequest);
|
|
@@ -221,7 +232,8 @@ public class ElectrocardiogramService : JsonRpcService, IVitalElectrocardiogramS
|
|
|
ReportDatasJson = request.ExamData,
|
|
|
PatientName = userInfo.UserName,
|
|
|
ReportTemplateCode = reportTemplateCode,
|
|
|
- Token = request.Token
|
|
|
+ Token = request.Token,
|
|
|
+ HealthDiagnosis = ecgExamData?.HealthDiagnosis ?? 0,
|
|
|
};
|
|
|
//新增报告
|
|
|
var result = await _ultrasoundReportService.VitalAddEcgReportAsync(addRequest);
|
|
@@ -233,4 +245,9 @@ public class ElectrocardiogramService : JsonRpcService, IVitalElectrocardiogramS
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
+
|
|
|
+ public class EcgExamDataModel
|
|
|
+ {
|
|
|
+ public int HealthDiagnosis { get; set; }
|
|
|
+ }
|
|
|
}
|