Commit 099e2e68 by 纪旭 韦

自定义列头修改

parent 69bd23f4
...@@ -386,7 +386,12 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest ...@@ -386,7 +386,12 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest
[HttpPost] [HttpPost]
public ApiResponse CustomColumnHeaders([FromBody] ComputerAliasRequest request) public ApiResponse CustomColumnHeaders([FromBody] ComputerAliasRequest request)
{ {
var result = _computeService.CustomColumnHeaders(request.HospitalId, request.Route); if (request.Heads != null)
for (int i = 0; i < request.Heads.Length; i++)
{
request.Heads[i] = request.Heads[i].ToLower();
}
var result = _computeService.CustomColumnHeaders(request.HospitalId, request.Route, request.Heads);
return new ApiResponse(ResponseType.OK, result); return new ApiResponse(ResponseType.OK, result);
} }
......
...@@ -50,8 +50,8 @@ public ComputerRequestValidator() ...@@ -50,8 +50,8 @@ public ComputerRequestValidator()
public class ComputerAliasRequest public class ComputerAliasRequest
{ {
public int HospitalId { get; set; } public int HospitalId { get; set; }
public string Route { get; set; } public string Route { get; set; }
public string[] Heads { get; set; }
} }
public class BeginEndTime public class BeginEndTime
{ {
......
...@@ -432,11 +432,9 @@ public List<dynamic> QueryComputeByDate(string viewName, DateTime beginTime, Dat ...@@ -432,11 +432,9 @@ public List<dynamic> QueryComputeByDate(string viewName, DateTime beginTime, Dat
sql = $"select {string.Join(",", groupBy)}, {string.Join(",", sumBy.Select(t => $"sum({t}) {t}"))} from ({sql}) tab group by {string.Join(",", groupBy)}"; sql = $"select {string.Join(",", groupBy)}, {string.Join(",", sumBy.Select(t => $"sum({t}) {t}"))} from ({sql}) tab group by {string.Join(",", groupBy)}";
sql = $@" select 0 as count;{sql}";
if (pageNumber != 0 && pageSize != 0) if (pageNumber != 0 && pageSize != 0)
sql = $@" select count(1) count from ({sql}) tab; sql = $@" select count(1) count from ({sql}) tab;
select * from ({sql}) tab limit {pageSize} offset {(pageNumber - 1) * pageSize};"; {sql} limit {pageSize} offset {(pageNumber - 1)};";
var queryMulti = context.Database.GetDbConnection().QueryMultiple(sql, new { beginTime, endTime }); var queryMulti = context.Database.GetDbConnection().QueryMultiple(sql, new { beginTime, endTime });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment