|
|
@@ -3,10 +3,8 @@ package com.nb.bus.stats.report;
|
|
|
import com.nb.bus.enums.StatsAnalyseEnum;
|
|
|
import com.nb.bus.enums.StatsTimeUnit;
|
|
|
import com.nb.bus.service.LocalBusInfusionHistoryService;
|
|
|
-import com.nb.bus.service.dto.CombineQuery;
|
|
|
import com.nb.bus.service.dto.CombineResult;
|
|
|
import com.nb.bus.stats.CommonClinicStats;
|
|
|
-import com.nb.bus.stats.CommonStats;
|
|
|
import com.nb.bus.stats.entity.LineResult;
|
|
|
import com.nb.bus.stats.entity.PieResult;
|
|
|
import com.nb.bus.stats.entity.StatsColumn;
|
|
|
@@ -92,7 +90,7 @@ public class AgeAndGenderStatsReport implements CommonClinicStats {
|
|
|
|
|
|
@Override
|
|
|
public List<TableResult> handleTable(List<CombineResult> results, StatsTimeUnit unit,Date minTime,Date maxTime) {
|
|
|
- Map<String, List<CombineResult>> groupByTime = groupByInfusionTime(results, unit,minTime,maxTime);
|
|
|
+ Map<String, List<CombineResult>> groupByTime = groupByClinicStartTime(results, unit,minTime,maxTime);
|
|
|
TableResult manTableResult = new TableResult();
|
|
|
manTableResult.setId("manTable");
|
|
|
manTableResult.setDescription("男性年龄分布表格");
|