jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f1d345f02172b1e1396bc8aaa443b8df737f8d58

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

筛查统计

Showing 2 changed files with 7 additions and 8 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ f1d345f
... ... @@ -386,7 +386,7 @@
386 386 Label label = new Label(0, 0, titleName,titleFormt);
387 387 ws.addCell(label);
388 388  
389   - Label label1 = new Label(1, 1, h1,h1Formt);
  389 + Label label1 = new Label(1, 0, h1,h1Formt);
390 390 ws.addCell(label1);
391 391  
392 392 int arrayIndex = 0;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ f1d345f
... ... @@ -1596,9 +1596,12 @@
1596 1596  
1597 1597 public void exportDiagnosisReportExcl(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, HttpServletResponse response) {
1598 1598 try {
  1599 + String hospitalId = autoMatchFacade.getHospitalId(userId);
1599 1600  
  1601 + Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
  1602 +
1600 1603 String titleName = "产前诊断及新生儿疾病筛查工作情况表";
1601   - String h1 = "填报单位（签章）：威海市妇幼保健院 ";
  1604 + String h1 = "填报单位（签章）： "+org.getName();
1602 1605 String[] dates = null;
1603 1606 if (StringUtils.isNotEmpty(cqSieveQueryRequest.getTime())) {
1604 1607 dates = cqSieveQueryRequest.getTime().split(" - ");
... ... @@ -1825,6 +1828,8 @@
1825 1828 dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
1826 1829 dataMap.put("hjStopCount",String.valueOf(hjStopCount));
1827 1830  
  1831 + list.add(dataMap);
  1832 +
1828 1833 }
1829 1834 sumDia(list);
1830 1835 return list;
... ... @@ -1910,7 +1915,6 @@
1910 1915 Map<String,String> dataMap = new LinkedHashMap<>();
1911 1916 dataMap.put("areaName","合计");
1912 1917 dataMap.put("sieveCount",String.valueOf(sieveCount));
1913   - dataMap.put("sieveCount",String.valueOf(sieveCount));
1914 1918 dataMap.put("st21Count",String.valueOf(st21Count));
1915 1919 dataMap.put("st1813Count",String.valueOf(st1813Count));
1916 1920 dataMap.put("sjqxCount",String.valueOf(sjqxCount));
... ... @@ -1918,7 +1922,6 @@
1918 1922 dataMap.put("disCount",String.valueOf(disCount));
1919 1923 dataMap.put("disExcCount",String.valueOf(disExcCount));
1920 1924 dataMap.put("disStopCount",String.valueOf(disStopCount));
1921   -
1922 1925 dataMap.put("csDiaCount",String.valueOf(csDiaCount));
1923 1926 dataMap.put("csClCount",String.valueOf(csClCount));
1924 1927 dataMap.put("csDzCount",String.valueOf(csDzCount));
1925 1928  
1926 1929  
1927 1930  
... ... @@ -1930,16 +1933,12 @@
1930 1933 dataMap.put("csJxCount",String.valueOf(csJxCount));
1931 1934 dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
1932 1935 dataMap.put("csDiaExcCount",String.valueOf(csDiaExcCount));
1933   -
1934 1936 dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
1935 1937 dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
1936   -
1937 1938 dataMap.put("teDiaCount",String.valueOf(teDiaCount));
1938 1939 dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
1939   -
1940 1940 dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
1941 1941 dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
1942   -
1943 1942 dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
1944 1943 dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
1945 1944 dataMap.put("hjStopCount",String.valueOf(hjStopCount));