diff --git a/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs b/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs index 29db1981..daf4c18e 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs @@ -196,7 +196,7 @@ namespace BMA.EHR.Insignia.Service.Controllers reportName = "reportInsignia1", data = new { - yearInsignalPeriod, + yearInsignalPeriod = yearInsignalPeriod, data = dataResult, } }; @@ -229,6 +229,8 @@ namespace BMA.EHR.Insignia.Service.Controllers { return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); } + var yearInsignalPeriod = await _repository.GetYearInsigniaPeriod(req.roundId); + var agency = ""; var data = await _repository.GetEvaluationResultReport(req.roundId, type, req.node, req.nodeId); @@ -238,6 +240,8 @@ namespace BMA.EHR.Insignia.Service.Controllers reportName = "reportInsignia2", data = new { + agency = agency, + yearInsignalPeriod = yearInsignalPeriod, data = data, } }; @@ -297,8 +301,8 @@ namespace BMA.EHR.Insignia.Service.Controllers reportName = "reportInsignia3", data = new { - yearInsignalPeriod, - summaryTotal, + yearInsignalPeriod = yearInsignalPeriod, + summaryTotal = summaryTotal, data = dataResult, } };