Commit a7fd094e7bb5692ea5a7d437e28568fe2209367a
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
a7fd094
| ... | ... | @@ -200,7 +200,6 @@ |
| 200 | 200 | // 4. 按省或市或地区查询区域内近12个自然月每月建档人数 |
| 201 | 201 | List<AreaData> patientMonthList = statisticsService.queryMonthPatients(new AreaDataQuery()); |
| 202 | 202 | Map<String, Map<String, Integer>> patientMonthMap = new HashMap<>(); |
| 203 | - | |
| 204 | 203 | Map<String, Integer> pmap = new HashMap<>(); |
| 205 | 204 | for (AreaData areaData:patientMonthList) { |
| 206 | 205 | String month = buildMonth(areaData.getYear()); |
| 207 | 206 | |
| ... | ... | @@ -211,7 +210,22 @@ |
| 211 | 210 | } |
| 212 | 211 | } |
| 213 | 212 | patientMonthMap.put("建档人数", pmap); |
| 213 | + // 6. 按省或市或地区查询区域内近12个自然月每月产检中历史高危人数（按颜色分组） | |
| 214 | + AreaDataQuery query = new AreaDataQuery(); | |
| 215 | + query.setDays(12); | |
| 216 | + List<AreaData> riskMonthList = statisticsService.queryHrefYearRisks(query); | |
| 217 | + Map<String, Integer> rmap = new HashMap<>(); | |
| 218 | + for (AreaData areaData:riskMonthList) { | |
| 219 | + String month = buildMonth(areaData.getYear()); | |
| 220 | + if (rmap.containsKey(month)) { | |
| 221 | + rmap.put(month, rmap.get(month) + areaData.getVal()); | |
| 222 | + } else { | |
| 223 | + rmap.put(month, areaData.getVal()); | |
| 224 | + } | |
| 225 | + } | |
| 226 | + patientMonthMap.put("高危人数", rmap); | |
| 214 | 227 | |
| 228 | + | |
| 215 | 229 | Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12)); |
| 216 | 230 | |
| 217 | 231 | |
| ... | ... | @@ -358,7 +372,6 @@ |
| 358 | 372 | option.setxAxis(xAxis); |
| 359 | 373 | AxisPointer yAxis = new AxisPointer(); |
| 360 | 374 | yAxis.setType("category"); |
| 361 | - yAxis.setAxisLabel(new AxisPointer()); | |
| 362 | 375 | List<Object> dataList = new ArrayList<Object>(); |
| 363 | 376 | yAxis.setData(dataList); |
| 364 | 377 | option.setyAxis(yAxis); |
platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/AxisPointer.java
View file @
a7fd094
| ... | ... | @@ -11,15 +11,6 @@ |
| 11 | 11 | private List<Object> boundaryGap; |
| 12 | 12 | private List<Object> data; |
| 13 | 13 | private Integer interval = 0; |
| 14 | - private AxisPointer axisLabel; | |
| 15 | - | |
| 16 | - public AxisPointer getAxisLabel() { | |
| 17 | - return axisLabel; | |
| 18 | - } | |
| 19 | - | |
| 20 | - public void setAxisLabel(AxisPointer axisLabel) { | |
| 21 | - this.axisLabel = axisLabel; | |
| 22 | - } | |
| 23 | 14 | |
| 24 | 15 | public Integer getInterval() { |
| 25 | 16 | return interval; |
platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml
View file @
a7fd094
| ... | ... | @@ -549,7 +549,7 @@ |
| 549 | 549 | AND F.HIGH_RISK_GROUP<>'其他' |
| 550 | 550 | AND B.EXAMINE_HISTORY_NUM=1 |
| 551 | 551 | AND B.INSERT_DATE<=TRUNC(SYSDATE) |
| 552 | - AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-12)) | |
| 552 | + AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-${days})) | |
| 553 | 553 | ]]> |
| 554 | 554 | <if test="provinceId != null and provinceId != ''"> |
| 555 | 555 | AND D.PROVINCE_ID=#{provinceId} |