jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 480d849b1beb118caa344558fa939a99f1817069

Authored by liquanyu
1 parent b617d24557
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

筛查统计

Showing 2 changed files with 3 additions and 22 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ 480d849
... ... @@ -357,27 +357,19 @@
357 357  
358 358 WritableWorkbook book = wb.createWorkbook(out,wb);
359 359 WritableSheet ws = book.getSheet(0);
360   -
361 360 WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
362 361 WritableCellFormat contentFormt = new WritableCellFormat(contentFont);
363 362 contentFormt.setAlignment(jxl.format.Alignment.CENTRE);
364 363 contentFormt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN);
365 364 contentFormt.setVerticalAlignment(VerticalAlignment.CENTRE);
366 365  
367   - WritableFont leftFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
368   - WritableCellFormat leftFormt = new WritableCellFormat(leftFont);
369   - leftFormt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN);
370   - leftFormt.setAlignment(Alignment.LEFT);
371   - leftFormt.setVerticalAlignment(VerticalAlignment.CENTRE);
372   -
373   -
374   - WritableFont title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
  366 + WritableFont title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
375 367 WritableCellFormat titleFormt = new WritableCellFormat(title);
376 368 titleFormt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN);
377 369 titleFormt.setAlignment(jxl.format.Alignment.CENTRE);
378 370 titleFormt.setVerticalAlignment(VerticalAlignment.CENTRE);
379 371  
380   - WritableFont h1Title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
  372 + WritableFont h1Title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
381 373 WritableCellFormat h1Formt = new WritableCellFormat(h1Title);
382 374 h1Formt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN);
383 375 h1Formt.setAlignment(Alignment.LEFT);
... ... @@ -386,7 +378,7 @@
386 378 Label label = new Label(0, 0, titleName,titleFormt);
387 379 ws.addCell(label);
388 380  
389   - Label label1 = new Label(1, 0, h1,h1Formt);
  381 + Label label1 = new Label(0, 1, h1,h1Formt);
390 382 ws.addCell(label1);
391 383  
392 384 int arrayIndex = 0;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 480d849
... ... @@ -1791,9 +1791,6 @@
1791 1791 }
1792 1792 }
1793 1793 disStopCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
1794   -
1795   -
1796   -
1797 1794 dataMap.put("sieveCount",String.valueOf(sieveCount));
1798 1795 dataMap.put("st21Count",String.valueOf(st21Count));
1799 1796 dataMap.put("st1813Count",String.valueOf(st1813Count));
... ... @@ -1802,7 +1799,6 @@
1802 1799 dataMap.put("disCount",String.valueOf(disCount));
1803 1800 dataMap.put("disExcCount",String.valueOf(disExcCount));
1804 1801 dataMap.put("disStopCount",String.valueOf(disStopCount));
1805   -
1806 1802 dataMap.put("csDiaCount",String.valueOf(csDiaCount));
1807 1803 dataMap.put("csClCount",String.valueOf(csClCount));
1808 1804 dataMap.put("csDzCount",String.valueOf(csDzCount));
1809 1805  
1810 1806  
1811 1807  
... ... @@ -1814,16 +1810,12 @@
1814 1810 dataMap.put("csJxCount",String.valueOf(csJxCount));
1815 1811 dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
1816 1812 dataMap.put("csDiaExcCount",String.valueOf(csDiaExcCount));
1817   -
1818 1813 dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
1819 1814 dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
1820   -
1821 1815 dataMap.put("teDiaCount",String.valueOf(teDiaCount));
1822 1816 dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
1823   -
1824 1817 dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
1825 1818 dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
1826   -
1827 1819 dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
1828 1820 dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
1829 1821 dataMap.put("hjStopCount",String.valueOf(hjStopCount));
1830 1822  
... ... @@ -1887,13 +1879,11 @@
1887 1879 disCount += Integer.parseInt(map.get("disCount"));
1888 1880 disExcCount += Integer.parseInt(map.get("disExcCount"));
1889 1881 disStopCount += Integer.parseInt(map.get("disStopCount"));
1890   -
1891 1882 csDiaCount += Integer.parseInt(map.get("csDiaCount"));
1892 1883 csClCount += Integer.parseInt(map.get("csClCount"));
1893 1884 csDzCount += Integer.parseInt(map.get("csDzCount"));
1894 1885 csXzbCount += Integer.parseInt(map.get("csXzbCount"));
1895 1886 csSjgqxCount += Integer.parseInt(map.get("csSjgqxCount"));
1896   -
1897 1887 csNjsCount += Integer.parseInt(map.get("csNjsCount"));
1898 1888 csZtdsCount += Integer.parseInt(map.get("csZtdsCount"));
1899 1889 csQtCount += Integer.parseInt(map.get("csQtCount"));
... ... @@ -1905,7 +1895,6 @@
1905 1895 teDiaCount += Integer.parseInt(map.get("teDiaCount"));
1906 1896 teDiaExcCount += Integer.parseInt(map.get("teDiaExcCount"));
1907 1897 qtDiaCount += Integer.parseInt(map.get("qtDiaCount"));
1908   -
1909 1898 qtDiaExcCount += Integer.parseInt(map.get("qtDiaExcCount"));
1910 1899 hjDiaCount += Integer.parseInt(map.get("hjDiaCount"));
1911 1900 hjDiaExcCount += Integer.parseInt(map.get("hjDiaExcCount"));