jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3e8e117da59ea3a4281181037af18087b9585e5a

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

筛查统计

Showing 1 changed file with 85 additions and 54 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 3e8e117
... ... @@ -1497,16 +1497,26 @@
1497 1497  
1498 1498 mapData.put("disExcCount",String.valueOf(disExcCount));//异常数
1499 1499  
1500   - mapData.put("sjDisCount",String.valueOf(sjDisCount));//诊断数
  1500 + mapData.put("sjDisCount","-");//诊断数
1501 1501  
1502   - mapData.put("sjDisExcCount",String.valueOf(sjDisExcCount));//异常数
  1502 + mapData.put("sjDisExcCount","-");//异常数
1503 1503  
1504   - mapData.put("dnaSieveCount",String.valueOf(dnaSieveCount));//筛查数
  1504 + mapData.put("dnaSieveCount","-");//筛查数
1505 1505  
1506   - mapData.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));//低风险人数
  1506 + mapData.put("dnaSieveLowCount","-");//低风险人数
1507 1507  
1508   - mapData.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));//高风险人数
  1508 + mapData.put("dnaSieveHighCount","-");//高风险人数
1509 1509  
  1510 + // mapData.put("sjDisCount",String.valueOf(sjDisCount));//诊断数
  1511 +
  1512 +// mapData.put("sjDisExcCount",String.valueOf(sjDisExcCount));//异常数
  1513 +//
  1514 +// mapData.put("dnaSieveCount",String.valueOf(dnaSieveCount));//筛查数
  1515 +//
  1516 +// mapData.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));//低风险人数
  1517 +//
  1518 +// mapData.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));//高风险人数
  1519 +
1510 1520 list.add(mapData);
1511 1521 }
1512 1522  
... ... @@ -1545,11 +1555,11 @@
1545 1555 sieveCount += Integer.parseInt(map.get("sieveCount"));
1546 1556 disCount += Integer.parseInt(map.get("disCount"));
1547 1557 disExcCount += Integer.parseInt(map.get("disExcCount"));
1548   - sjDisCount += Integer.parseInt(map.get("sjDisCount"));
1549   - sjDisExcCount += Integer.parseInt(map.get("sjDisExcCount"));
1550   - dnaSieveCount += Integer.parseInt(map.get("dnaSieveCount"));
1551   - dnaSieveLowCount += Integer.parseInt(map.get("dnaSieveLowCount"));
1552   - dnaSieveHighCount += Integer.parseInt(map.get("dnaSieveHighCount"));
  1558 +// sjDisCount += Integer.parseInt(map.get("sjDisCount"));
  1559 +// sjDisExcCount += Integer.parseInt(map.get("sjDisExcCount"));
  1560 +// dnaSieveCount += Integer.parseInt(map.get("dnaSieveCount"));
  1561 +// dnaSieveLowCount += Integer.parseInt(map.get("dnaSieveLowCount"));
  1562 +// dnaSieveHighCount += Integer.parseInt(map.get("dnaSieveHighCount"));
1553 1563 }
1554 1564 }
1555 1565 Map<String,String> totalMap = new LinkedHashMap<>();
1556 1566  
... ... @@ -1562,12 +1572,18 @@
1562 1572 totalMap.put("sjqxCount",String.valueOf(sjqxCount));
1563 1573 totalMap.put("disCount",String.valueOf(disCount));
1564 1574 totalMap.put("disExcCount",String.valueOf(disExcCount));
1565   - totalMap.put("sjDisCount",String.valueOf(sjDisCount));
1566   - totalMap.put("sjDisExcCount",String.valueOf(sjDisExcCount));
1567   - totalMap.put("dnaSieveCount",String.valueOf(dnaSieveCount));
1568   - totalMap.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));
1569   - totalMap.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));
  1575 + totalMap.put("sjDisCount","-");
  1576 + totalMap.put("sjDisExcCount","-");
  1577 + totalMap.put("dnaSieveCount","-");
  1578 + totalMap.put("dnaSieveLowCount","-");
  1579 + totalMap.put("dnaSieveHighCount","-");
1570 1580  
  1581 +// totalMap.put("sjDisCount",String.valueOf(sjDisCount));
  1582 +// totalMap.put("sjDisExcCount",String.valueOf(sjDisExcCount));
  1583 +// totalMap.put("dnaSieveCount",String.valueOf(dnaSieveCount));
  1584 +// totalMap.put("dnaSieveLowCount",String.valueOf(dnaSieveLowCount));
  1585 +// totalMap.put("dnaSieveHighCount",String.valueOf(dnaSieveHighCount));
  1586 +
1571 1587 list.add(totalMap);
1572 1588 }
1573 1589  
1574 1590  
... ... @@ -1858,23 +1874,23 @@
1858 1874 dataMap.put("disCount",String.valueOf(disCount));
1859 1875 dataMap.put("disExcCount",String.valueOf(disExcCount));
1860 1876 dataMap.put("disStopCount",String.valueOf(disStopCount));
1861   - dataMap.put("csDiaCount",String.valueOf(csDiaCount));
1862   - dataMap.put("csClCount",String.valueOf(csClCount));
1863   - dataMap.put("csDzCount",String.valueOf(csDzCount));
1864   - dataMap.put("csXzbCount",String.valueOf(csXzbCount));
1865   - dataMap.put("csSjgqxCount",String.valueOf(csSjgqxCount));
1866   - dataMap.put("csNjsCount",String.valueOf(csNjsCount));
1867   - dataMap.put("csZtdsCount",String.valueOf(csZtdsCount));
1868   - dataMap.put("csQtCount",String.valueOf(csQtCount));
1869   - dataMap.put("csJxCount",String.valueOf(csJxCount));
1870   - dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
1871   - dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
  1877 + dataMap.put("csDiaCount","-");
  1878 + dataMap.put("csClCount","-");
  1879 + dataMap.put("csDzCount","-");
  1880 + dataMap.put("csXzbCount","-");
  1881 + dataMap.put("csSjgqxCount","-");
  1882 + dataMap.put("csNjsCount","-");
  1883 + dataMap.put("csZtdsCount","-");
  1884 + dataMap.put("csQtCount","-");
  1885 + dataMap.put("csJxCount","-");
  1886 + dataMap.put("ysDiaCount","-");
  1887 + dataMap.put("ysDiaExcCount","-");
1872 1888 dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
1873 1889 dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
1874 1890 dataMap.put("teDiaCount",String.valueOf(teDiaCount));
1875 1891 dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
1876   - dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
1877   - dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
  1892 + dataMap.put("qtDiaCount","-");
  1893 + dataMap.put("qtDiaExcCount","-");
1878 1894 dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
1879 1895 dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
1880 1896 dataMap.put("hjStopCount",String.valueOf(hjStopCount));
1881 1897  
... ... @@ -1938,23 +1954,23 @@
1938 1954 disCount += Integer.parseInt(map.get("disCount"));
1939 1955 disExcCount += Integer.parseInt(map.get("disExcCount"));
1940 1956 disStopCount += Integer.parseInt(map.get("disStopCount"));
1941   - csDiaCount += Integer.parseInt(map.get("csDiaCount"));
1942   - csClCount += Integer.parseInt(map.get("csClCount"));
1943   - csDzCount += Integer.parseInt(map.get("csDzCount"));
1944   - csXzbCount += Integer.parseInt(map.get("csXzbCount"));
1945   - csSjgqxCount += Integer.parseInt(map.get("csSjgqxCount"));
1946   - csNjsCount += Integer.parseInt(map.get("csNjsCount"));
1947   - csZtdsCount += Integer.parseInt(map.get("csZtdsCount"));
1948   - csQtCount += Integer.parseInt(map.get("csQtCount"));
1949   - csJxCount += Integer.parseInt(map.get("csJxCount"));
1950   - ysDiaCount += Integer.parseInt(map.get("ysDiaCount"));
1951   - ysDiaExcCount += Integer.parseInt(map.get("ysDiaExcCount"));
  1957 +// csDiaCount += Integer.parseInt(map.get("csDiaCount"));
  1958 +// csClCount += Integer.parseInt(map.get("csClCount"));
  1959 +// csDzCount += Integer.parseInt(map.get("csDzCount"));
  1960 +// csXzbCount += Integer.parseInt(map.get("csXzbCount"));
  1961 +// csSjgqxCount += Integer.parseInt(map.get("csSjgqxCount"));
  1962 +// csNjsCount += Integer.parseInt(map.get("csNjsCount"));
  1963 +// csZtdsCount += Integer.parseInt(map.get("csZtdsCount"));
  1964 +// csQtCount += Integer.parseInt(map.get("csQtCount"));
  1965 +// csJxCount += Integer.parseInt(map.get("csJxCount"));
  1966 +// ysDiaCount += Integer.parseInt(map.get("ysDiaCount"));
  1967 +// ysDiaExcCount += Integer.parseInt(map.get("ysDiaExcCount"));
1952 1968 rmDiaCount += Integer.parseInt(map.get("rmDiaCount"));
1953 1969 rmDiaExcCount += Integer.parseInt(map.get("rmDiaExcCount"));
1954 1970 teDiaCount += Integer.parseInt(map.get("teDiaCount"));
1955 1971 teDiaExcCount += Integer.parseInt(map.get("teDiaExcCount"));
1956   - qtDiaCount += Integer.parseInt(map.get("qtDiaCount"));
1957   - qtDiaExcCount += Integer.parseInt(map.get("qtDiaExcCount"));
  1972 +// qtDiaCount += Integer.parseInt(map.get("qtDiaCount"));
  1973 +// qtDiaExcCount += Integer.parseInt(map.get("qtDiaExcCount"));
1958 1974 hjDiaCount += Integer.parseInt(map.get("hjDiaCount"));
1959 1975 hjDiaExcCount += Integer.parseInt(map.get("hjDiaExcCount"));
1960 1976 hjStopCount += Integer.parseInt(map.get("hjStopCount"));
1961 1977  
... ... @@ -1970,23 +1986,38 @@
1970 1986 dataMap.put("disCount",String.valueOf(disCount));
1971 1987 dataMap.put("disExcCount",String.valueOf(disExcCount));
1972 1988 dataMap.put("disStopCount",String.valueOf(disStopCount));
1973   - dataMap.put("csDiaCount",String.valueOf(csDiaCount));
1974   - dataMap.put("csClCount",String.valueOf(csClCount));
1975   - dataMap.put("csDzCount",String.valueOf(csDzCount));
1976   - dataMap.put("csXzbCount",String.valueOf(csXzbCount));
1977   - dataMap.put("csSjgqxCount",String.valueOf(csSjgqxCount));
1978   - dataMap.put("csNjsCount",String.valueOf(csNjsCount));
1979   - dataMap.put("csZtdsCount",String.valueOf(csZtdsCount));
1980   - dataMap.put("csQtCount",String.valueOf(csQtCount));
1981   - dataMap.put("csJxCount",String.valueOf(csJxCount));
1982   - dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
1983   - dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
  1989 +
  1990 + dataMap.put("csDiaCount","-");
  1991 + dataMap.put("csClCount","-");
  1992 + dataMap.put("csDzCount","-");
  1993 + dataMap.put("csXzbCount","-");
  1994 + dataMap.put("csSjgqxCount","-");
  1995 + dataMap.put("csNjsCount","-");
  1996 + dataMap.put("csZtdsCount","-");
  1997 + dataMap.put("csQtCount","-");
  1998 + dataMap.put("csJxCount","-");
  1999 + dataMap.put("ysDiaCount","-");
  2000 + dataMap.put("ysDiaExcCount","-");
  2001 +
  2002 +// dataMap.put("csDiaCount",String.valueOf(csDiaCount));
  2003 +// dataMap.put("csClCount",String.valueOf(csClCount));
  2004 +// dataMap.put("csDzCount",String.valueOf(csDzCount));
  2005 +// dataMap.put("csXzbCount",String.valueOf(csXzbCount));
  2006 +// dataMap.put("csSjgqxCount",String.valueOf(csSjgqxCount));
  2007 +// dataMap.put("csNjsCount",String.valueOf(csNjsCount));
  2008 +// dataMap.put("csZtdsCount",String.valueOf(csZtdsCount));
  2009 +// dataMap.put("csQtCount",String.valueOf(csQtCount));
  2010 +// dataMap.put("csJxCount",String.valueOf(csJxCount));
  2011 +// dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
  2012 +// dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
1984 2013 dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
1985 2014 dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
1986 2015 dataMap.put("teDiaCount",String.valueOf(teDiaCount));
1987 2016 dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
1988   - dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
1989   - dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
  2017 +// dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
  2018 +// dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
  2019 + dataMap.put("qtDiaCount","-");
  2020 + dataMap.put("qtDiaExcCount","-");
1990 2021 dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
1991 2022 dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
1992 2023 dataMap.put("hjStopCount",String.valueOf(hjStopCount));