jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d6f241435244756d1621f547367b4dd19bc1f92c

Authored by liquanyu
2 parents a635985a66 672eca1d23
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java View file @ d6f2414
... ... @@ -132,7 +132,7 @@
132 132 dataList.add(data);
133 133 }
134 134  
135   - Option option = buildMapOption("孕妇建档数", null);
  135 + Option option = buildMapOption("全国孕妇建档及高危数", null);
136 136 option.getLegend().setTop("50px");
137 137 List<Object> seriesList = new ArrayList<>();
138 138 Series series = new Series();
... ... @@ -286,6 +286,7 @@
286 286  
287 287 // TYPE 省数据
288 288 else if (type == 2) {
  289 + String provinceName = null;
289 290 AreaDataQuery query = new AreaDataQuery();
290 291 query.setProvinceId(pid);
291 292 // 地图数据
292 293  
293 294  
294 295  
... ... @@ -322,20 +323,26 @@
322 323 areaBarOption.setSeries(areaBarSeriesList);
323 324  
324 325 for (AreaData areaData:provinceRiskList) {
325   - String rigino = areaData.getCityName().replace("市", "").replace("省", "");
  326 + if (provinceName == null) {
  327 + provinceName = areaData.getProvinceName();
  328 + }
  329 + String rigino = areaData.getCityName();
326 330 if (mapsData.get(rigino) == null) {
327 331 mapsData.put(rigino, areaData.getVal());
328   - kvData.put(rigino, areaData.getProvinceId());
  332 + kvData.put(rigino, areaData.getCityId());
329 333 } else {
330 334 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
331 335 }
332 336 }
333 337 for (AreaData areaData:provincePatientList) {
334   - String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
  338 + if (provinceName == null) {
  339 + provinceName = areaData.getProvinceName();
  340 + }
  341 + String rigino = areaData.getCityName();
335 342 if (mapsData.get(rigino) == null) {
336 343 riskDataList.add(0);
337 344 mapsData.put(rigino, areaData.getVal());
338   - kvData.put(rigino, areaData.getProvinceId());
  345 + kvData.put(rigino, areaData.getCityId());
339 346 } else {
340 347 riskDataList.add(mapsData.get(rigino));
341 348 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
342 349  
... ... @@ -353,13 +360,13 @@
353 360 dataList.add(data);
354 361 }
355 362  
356   - Option option = buildMapOption("孕妇建档数", null);
  363 + Option option = buildMapOption(provinceName + "孕妇建档及高危数", null);
357 364 option.getLegend().setTop("50px");
358 365 List<Object> seriesList = new ArrayList<>();
359 366 Series series = new Series();
360 367 series.setName("建档及高危数");
361 368 series.setType("map");
362   - series.setMapType("china");
  369 + series.setMapType(provinceName.replace("市","").replace("省",""));
363 370 series.setRoam(false);
364 371 series.setData(dataList);
365 372 series.setLabel(label);
... ... @@ -368,7 +375,7 @@
368 375  
369 376  
370 377 // 高危数据
371   - List<AreaData> currentRiskList = statisticsService.queryRisks(new AreaDataQuery());
  378 + List<AreaData> currentRiskList = statisticsService.queryRisks(query);
372 379 Option groupRiskOption = buildyBarOption("当前高危人数", null);
373 380 groupRiskOption.getTooltip().setShow(true);
374 381 List<Object> groupRiskSeriesList = new ArrayList<>();
... ... @@ -451,7 +458,6 @@
451 458 Option patientMonthOption = buildLineOption("建档及高危人数", null, patientMonthMap, buildDefaultMonth(12));
452 459  
453 460 // 按省或市或地区查询区域内近12个自然月每月初诊人数、复诊人数
454   - query = new AreaDataQuery();
455 461 List<AreaData> reportMonthList = statisticsService.queryMonthReports(query);
456 462 Map<String, Map<String, Integer>> reportMonthMap = new HashMap<>();
457 463 Map<String, Integer> firstmap = new HashMap<>();
... ... @@ -493,7 +499,7 @@
493 499 Option groupRiskMonthOption = buildxBarOption("高危历史人数", null, groupRiskMonthMap, buildDefaultMonth(6), colormap);
494 500  
495 501  
496   - result.put("type", 1);
  502 + result.put("type", 2);
497 503 result.put("kvData", kvData);
498 504 result.put("mapsOption", option);
499 505 result.put("areaBarOption", areaBarOption);
... ... @@ -593,7 +599,6 @@
593 599 legend.setTop("20px");
594 600 legend.setLeft("left");
595 601 List<Object> tempList = new ArrayList<Object>();
596   - tempList.add("建档及高危数");
597 602 legend.setData(tempList);
598 603 option.setLegend(legend);
599 604 option.setVisualMap(new VisualMap());
600 605  
... ... @@ -679,8 +684,14 @@
679 684 option.setyAxis(xAxis);
680 685 List<Object> seriesList = new ArrayList<>();
681 686 option.setSeries(seriesList);
  687 + List<String> color = new ArrayList<>();
682 688 for (String groupName:map.keySet()) {
683 689 legendData.add(groupName);
  690 + if (colormap.containsKey(groupName)) {
  691 + color.add(colormap.get(groupName));
  692 + } else {
  693 + color.add(option.getColor()[new Random().nextInt(10)]);
  694 + }
684 695 Map<String, Integer> sub = map.get(groupName);
685 696 Series series = new Series();
686 697 series.setName(groupName);
... ... @@ -701,6 +712,8 @@
701 712 }
702 713 seriesList.add(series);
703 714 }
  715 + String[] array = new String[color.size()];
  716 + option.setColor(color.toArray(array));
704 717 AxisPointer yAxis = new AxisPointer();
705 718 yAxis.setType("category");
706 719 yAxis.setData(xData);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ d6f2414
... ... @@ -165,9 +165,13 @@
165 165 }
166 166 postReviewQuery = new PostReviewQuery();
167 167 postReviewQuery.setYn(YnEnums.YES.getId());
168   - postReviewQuery.setStart(date);
169   - //下次建档记录前都是产后复查
170   - postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() : new Date());
  168 + if(list.size() - 1 > i){
  169 + postReviewQuery.setStart(date);
  170 + //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
  171 +// postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/);
  172 + postReviewQuery.setEnd(list.get(i).getCreated());
  173 + }
  174 +
171 175 postReviewQuery.setParentId(patients.getId());
172 176 }
173 177 i++;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ d6f2414
... ... @@ -88,6 +88,38 @@
88 88 this.extPlacentas = extPlacentas;
89 89 }
90 90  
  91 + public Integer getoHloseBloodL() {
  92 + return oHloseBloodL;
  93 + }
  94 +
  95 + public void setoHloseBloodL(Integer oHloseBloodL) {
  96 + this.oHloseBloodL = oHloseBloodL;
  97 + }
  98 +
  99 + public Integer getrHloseBloodL() {
  100 + return rHloseBloodL;
  101 + }
  102 +
  103 + public void setrHloseBloodL(Integer rHloseBloodL) {
  104 + this.rHloseBloodL = rHloseBloodL;
  105 + }
  106 +
  107 + public Integer getsHloseBloodL() {
  108 + return sHloseBloodL;
  109 + }
  110 +
  111 + public void setsHloseBloodL(Integer sHloseBloodL) {
  112 + this.sHloseBloodL = sHloseBloodL;
  113 + }
  114 +
  115 + public Integer gettHloseBloodL() {
  116 + return tHloseBloodL;
  117 + }
  118 +
  119 + public void settHloseBloodL(Integer tHloseBloodL) {
  120 + this.tHloseBloodL = tHloseBloodL;
  121 + }
  122 +
91 123 @Override
92 124 public MaternalDeliverModel convertToDataModel() {
93 125 MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/Option.java View file @ d6f2414
... ... @@ -13,9 +13,27 @@
13 13 private VisualMap visualMap;
14 14 private Tooltip toolbox;
15 15 private List<Object> series;
  16 + private String[] color = {"#2f4554","#c23531", "#61a0a8", "#d48265", "#91c7ae","#749f83", "#ca8622", "#bda29a","#6e7074", "#546570", "#c4ccd3"};
  17 + private String backgroundColor = "rgba(235, 235, 235, 0.3)";
16 18  
17 19 private Grid grid;
18 20 private AxisPointer xAxis;
  21 +
  22 + public String getBackgroundColor() {
  23 + return backgroundColor;
  24 + }
  25 +
  26 + public void setBackgroundColor(String backgroundColor) {
  27 + this.backgroundColor = backgroundColor;
  28 + }
  29 +
  30 + public String[] getColor() {
  31 + return color;
  32 + }
  33 +
  34 + public void setColor(String[] color) {
  35 + this.color = color;
  36 + }
19 37  
20 38 public AxisPointer getyAxis() {
21 39 return yAxis;