zhaops 5 rokov pred
rodič
commit
71522040fd

+ 20 - 20
src/main/java/com/diagbot/aggregate/AverageStatisticsAggregate.java

@@ -1,7 +1,7 @@
 package com.diagbot.aggregate;
 
 import com.diagbot.dto.AverageStatisticsDTO;
-import com.diagbot.facade.ConsoleFacade;
+import com.diagbot.facade.FilterFacade;
 import com.diagbot.facade.HomePageFacade;
 import com.diagbot.facade.QcresultInfoFacade;
 import com.diagbot.util.BeanUtil;
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description:
+ * @Description:平均值相关统计
  * @Author:zhaops
  * @time: 2020/4/23 14:11
  */
@@ -35,7 +35,7 @@ public class AverageStatisticsAggregate {
     @Autowired
     private QcresultInfoFacade qcresultInfoFacade;
     @Autowired
-    private ConsoleFacade consoleFacade;
+    private FilterFacade filterFacade;
 
     @DataProvider("setAllAverage")
     public Map<String, Object> setAllResult(
@@ -68,8 +68,8 @@ public class AverageStatisticsAggregate {
         List<AverageStatisticsDTO> averageDayNumList = homePageFacade.getAverageDayNum(filterVO);
 
         //上月、去年
-        String startDate = consoleFacade.getLastStartDateStr(filterVO.getType());
-        String endDate = consoleFacade.getLastEndDateStr(filterVO.getType());
+        String startDate = filterFacade.getLastStartDateStr(filterVO.getType());
+        String endDate = filterFacade.getLastEndDateStr(filterVO.getType());
         filterVO.setStartDate(startDate);
         filterVO.setEndDate(endDate);
         List<AverageStatisticsDTO> lastAverageDayNumList = homePageFacade.getAverageDayNum(filterVO);
@@ -80,8 +80,8 @@ public class AverageStatisticsAggregate {
         if (filterVO.getType().equals(1)) {
             Date date = new Date();
             String year = DateUtil.getYear(date);
-            startDate = consoleFacade.getStartDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
-            endDate = consoleFacade.getEndDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
+            startDate = filterFacade.getStartDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
+            endDate = filterFacade.getEndDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
             filterVO.setStartDate(startDate);
             filterVO.setEndDate(endDate);
         }
@@ -92,11 +92,11 @@ public class AverageStatisticsAggregate {
                 = EntityUtil.makeMapWithKeyValue(lastYearAverageDayNumList, "deptName", "averageValue");
 
         averageDayNumList.forEach(item -> {
-            if (lastMap.containsKey(item.getDeptName())) {
-                item.setLastAverageValue(lastMap.get(item.getDeptName()));
+            if (lastMap.containsKey(item.getName())) {
+                item.setLastAverageValue(lastMap.get(item.getName()));
             }
-            if (lastYearMap.containsKey(item.getDeptName())) {
-                item.setLastYearAverageValue(lastYearMap.get(item.getDeptName()));
+            if (lastYearMap.containsKey(item.getName())) {
+                item.setLastYearAverageValue(lastYearMap.get(item.getName()));
             }
         });
         retAverageDayNumList = averageDayNumList.subList(0, 10);
@@ -114,8 +114,8 @@ public class AverageStatisticsAggregate {
         List<AverageStatisticsDTO> retAverageFeeList = Lists.newLinkedList();
         List<AverageStatisticsDTO> averageFeeList = homePageFacade.getAverageFee(filterVO);
         //上月、去年
-        String startDate = consoleFacade.getLastStartDateStr(filterVO.getType());
-        String endDate = consoleFacade.getLastEndDateStr(filterVO.getType());
+        String startDate = filterFacade.getLastStartDateStr(filterVO.getType());
+        String endDate = filterFacade.getLastEndDateStr(filterVO.getType());
         filterVO.setStartDate(startDate);
         filterVO.setEndDate(endDate);
         List<AverageStatisticsDTO> lastAverageFeeList = homePageFacade.getAverageDayNum(filterVO);
@@ -126,8 +126,8 @@ public class AverageStatisticsAggregate {
         if (filterVO.getType().equals(1)) {
             Date date = new Date();
             String year = DateUtil.getYear(date);
-            startDate = consoleFacade.getStartDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
-            endDate = consoleFacade.getEndDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
+            startDate = filterFacade.getStartDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
+            endDate = filterFacade.getEndDateStr(filterVO.getType(), Integer.valueOf(year) - 1);
             filterVO.setStartDate(startDate);
             filterVO.setEndDate(endDate);
         }
@@ -138,11 +138,11 @@ public class AverageStatisticsAggregate {
                 = EntityUtil.makeMapWithKeyValue(lastYearAverageFeeList, "deptName", "averageValue");
 
         averageFeeList.forEach(item -> {
-            if (lastMap.containsKey(item.getDeptName())) {
-                item.setLastAverageValue(lastMap.get(item.getDeptName()));
+            if (lastMap.containsKey(item.getName())) {
+                item.setLastAverageValue(lastMap.get(item.getName()));
             }
-            if (lastYearMap.containsKey(item.getDeptName())) {
-                item.setLastYearAverageValue(lastYearMap.get(item.getDeptName()));
+            if (lastYearMap.containsKey(item.getName())) {
+                item.setLastYearAverageValue(lastYearMap.get(item.getName()));
             }
         });
         retAverageFeeList = averageFeeList.subList(0, 10);
@@ -196,7 +196,7 @@ public class AverageStatisticsAggregate {
                     .divide(BigDecimal.valueOf(num), 2, RoundingMode.HALF_UP)
                     .doubleValue();
             AverageStatisticsDTO retAverageStatistics = new AverageStatisticsDTO();
-            retAverageStatistics.setDeptName("其他");
+            retAverageStatistics.setName("其他");
             retAverageStatistics.setNum(num);
             retAverageStatistics.setAverageValue(averageValue);
             retAverageStatistics.setTotleValue(totleValue);

+ 0 - 119
src/main/java/com/diagbot/aggregate/DeptStatisticsAggregate.java

@@ -1,119 +0,0 @@
-package com.diagbot.aggregate;
-
-import com.diagbot.dto.QcResultPercentDTO;
-import com.diagbot.dto.ResultDetailDTO;
-import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.QcresultInfoFacade;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.vo.FilterVO;
-import com.google.common.collect.Lists;
-import io.github.lvyahui8.spring.annotation.DataConsumer;
-import io.github.lvyahui8.spring.annotation.DataProvider;
-import io.github.lvyahui8.spring.annotation.InvokeParameter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:科室统计
- * @Author:zhaops
- * @time: 2020/5/6 17:21
- */
-@Component
-public class DeptStatisticsAggregate {
-    @Autowired
-    private BehospitalInfoFacade behospitalInfoFacade;
-    @Autowired
-    private QcresultInfoFacade qcresultInfoFacade;
-
-    @DataProvider("setAllDept")
-    public Map<String, Object> setAllDept(
-            @InvokeParameter("filterVO") FilterVO filterVO,
-            @DataConsumer("getLevelResultDept") List<QcResultPercentDTO> levelResults,
-            @DataConsumer("getResultDept") List<ResultDetailDTO> results) {
-        Map<String, Object> retMap = new LinkedHashMap<>();
-        if (ListUtil.isNotEmpty(levelResults)) {
-            retMap.put("各科室甲级病历占比", levelResults);
-        }
-        if (ListUtil.isNotEmpty(results)) {
-            retMap.put("各科室缺陷占比", results);
-        }
-        return retMap;
-    }
-
-    /**
-     * 各科室甲级病历占比
-     *
-     * @param filterVO
-     * @return
-     */
-    @DataProvider("getLevelResultDept")
-    public List<QcResultPercentDTO> getLevelResultDept(@InvokeParameter("filterVO") FilterVO filterVO) {
-        List<QcResultPercentDTO> qcResultPercentList = qcresultInfoFacade.levelPercentGroupByDept(filterVO);
-        qcResultPercentList = qcResultPercentList.stream().limit(10).collect(Collectors.toList());
-        return qcResultPercentList;
-    }
-
-
-    /**
-     * 各科室缺陷占比
-     *
-     * @param filterVO
-     * @return
-     */
-    @DataProvider("getResultDept")
-    public List<ResultDetailDTO> getResultDept(@InvokeParameter("filterVO") FilterVO filterVO) {
-        List<ResultDetailDTO> results2 = behospitalInfoFacade.resultStatisticsByDept2(filterVO);
-        if (ListUtil.isNotEmpty(results2)) {
-            int totle = results2
-                    .stream()
-                    .map(ResultDetailDTO::getNum)
-                    .reduce(0, Integer::sum);
-            results2.forEach(result -> {
-                Double percent = BigDecimal.valueOf(result.getNum())
-                        .divide(BigDecimal.valueOf(totle), 4, RoundingMode.HALF_UP)
-                        .doubleValue();
-                result.setPercent(percent);
-            });
-            List<ResultDetailDTO> retResults = Lists.newLinkedList();
-            if (results2.size() <= 10) {
-                retResults = BeanUtil.listCopyTo(results2, ResultDetailDTO.class);
-            } else {
-
-                Double rate = 0d;
-                Integer num = 0;
-                for (ResultDetailDTO result : results2) {
-                    if (retResults.size() < 9) {
-                        rate = BigDecimal.valueOf(rate)
-                                .add(BigDecimal.valueOf(Double.valueOf(result.getPercent())))
-                                .doubleValue();
-                        retResults.add(result);
-                    } else {
-                        num += result.getNum();
-                    }
-                }
-                ResultDetailDTO retResult = new ResultDetailDTO();
-                retResult.setName("其他");
-                retResult.setNum(num);
-                retResult.setPercent(BigDecimal.valueOf(1).subtract(BigDecimal.valueOf(rate)).doubleValue());
-                retResults.add(retResult);
-            }
-            retResults.forEach(result -> {
-                DecimalFormat df = new DecimalFormat("#0.00");
-                String percentStr
-                        = df.format(BigDecimal.valueOf(result.getPercent()).multiply(BigDecimal.valueOf(100))) + "%";
-                result.setPercentStr(percentStr);
-            });
-            return retResults;
-        }
-        return null;
-    }
-}

+ 161 - 0
src/main/java/com/diagbot/aggregate/MrStatisticsAggregate.java

@@ -0,0 +1,161 @@
+package com.diagbot.aggregate;
+
+import com.diagbot.dto.NumDTO;
+import com.diagbot.dto.QcResultPercentDTO;
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.QcresultInfoFacade;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.vo.FilterVO;
+import com.diagbot.vo.HomePageFilterVO;
+import com.diagbot.vo.QcresultFilterVO;
+import com.google.common.collect.Lists;
+import io.github.lvyahui8.spring.annotation.DataConsumer;
+import io.github.lvyahui8.spring.annotation.DataProvider;
+import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:病历相关统计
+ * @Author:zhaops
+ * @time: 2020/5/6 17:21
+ */
+@Component
+public class MrStatisticsAggregate {
+
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+    @Autowired
+    private QcresultInfoFacade qcresultInfoFacade;
+
+    @DataProvider("setAllMr")
+    public Map<String, Object> setAllDept(
+            @InvokeParameter("filterVO") FilterVO filterVO,
+            @DataConsumer("getLevelResultDept") List<QcResultPercentDTO> levelResults,
+            @DataConsumer("leaveHosCount") Map<String, Object> leaveHosMap,
+            @DataConsumer("mrCount") List<NumDTO> mrCountList) {
+        Map<String, Object> retMap = new LinkedHashMap<>();
+        if (ListUtil.isNotEmpty(levelResults)) {
+            retMap.put("各科室甲级病历占比", levelResults);
+        }
+        if (leaveHosMap != null) {
+            retMap.put("出院人数统计", leaveHosMap);
+        }
+        if (ListUtil.isNotEmpty(mrCountList)) {
+            retMap.put("病历数统计", mrCountList);
+        }
+        return retMap;
+    }
+
+    /**
+     * 各科室甲级病历占比
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getLevelResultDept")
+    public List<QcResultPercentDTO> getLevelResultDept(@InvokeParameter("filterVO") FilterVO filterVO) {
+        List<QcResultPercentDTO> qcResultPercentList = qcresultInfoFacade.levelPercentGroupByDept(filterVO);
+        qcResultPercentList = qcResultPercentList.stream().limit(10).collect(Collectors.toList());
+        return qcResultPercentList;
+    }
+
+    /**
+     * 出院人数统计
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("leaveHosCount")
+    public Map<String, Object> leaveHosCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        Map<String, Object> retMap = new LinkedHashMap<>();
+        retMap.put("总人数", 0);
+        retMap.put("死亡人数", 0);
+        retMap.put("新生儿人数", 0);
+        retMap.put("手术病人数", 0);
+        HomePageFilterVO homePageFilterVO = new HomePageFilterVO();
+        BeanUtil.copyProperties(filterVO, homePageFilterVO);
+        Integer totleNum = behospitalInfoFacade.homePageCount(homePageFilterVO);
+        homePageFilterVO.setDeath(1);
+        Integer deathNum = behospitalInfoFacade.homePageCount(homePageFilterVO);
+        homePageFilterVO.setDeath(null);
+        homePageFilterVO.setNewBorn(1);
+        Integer newBornNum = behospitalInfoFacade.homePageCount(homePageFilterVO);
+        Integer operationNum = behospitalInfoFacade.homePageCountForOperation(filterVO);
+        retMap.put("总人数", totleNum);
+        retMap.put("死亡人数", deathNum);
+        retMap.put("新生儿人数", newBornNum);
+        retMap.put("手术病人数", operationNum);
+        return retMap;
+    }
+
+    /**
+     * 质控病历统计
+     *
+     * @return
+     */
+    @DataProvider("mrCount")
+    public List<NumDTO> mrCount(FilterVO filterVO) {
+        DecimalFormat df = new DecimalFormat("#0.00");
+        List<NumDTO> retList = Lists.newLinkedList();
+        QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
+        BeanUtil.copyProperties(filterVO, qcresultFilterVO);
+
+        int totleNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
+        qcresultFilterVO.setLevel("甲");
+        int firstLevelNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
+        qcresultFilterVO.setLevel("乙");
+        int secondLevelNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
+        qcresultFilterVO.setLevel("丙");
+        int thirdLevelNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
+        NumDTO totleNumDTO = new NumDTO();
+        totleNumDTO.setName("累计质控病历数");
+        totleNumDTO.setTotleNum(totleNum);
+        totleNumDTO.setNum(totleNum);
+        NumDTO firstLevelNumDTO = new NumDTO();
+        firstLevelNumDTO.setName("甲级病历");
+        firstLevelNumDTO.setNum(firstLevelNum);
+        firstLevelNumDTO.setTotleNum(totleNum);
+        Double firstPercent = BigDecimal.valueOf(firstLevelNum)
+                .divide(BigDecimal.valueOf(totleNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String firstPercentStr = df.format(BigDecimal.valueOf(firstPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        firstLevelNumDTO.setPercent(firstPercent);
+        firstLevelNumDTO.setPercentStr(firstPercentStr);
+        NumDTO secondLevelNumDTO = new NumDTO();
+        secondLevelNumDTO.setName("乙级病历");
+        secondLevelNumDTO.setNum(secondLevelNum);
+        secondLevelNumDTO.setTotleNum(totleNum);
+        Double secondPercent = BigDecimal.valueOf(secondLevelNum)
+                .divide(BigDecimal.valueOf(totleNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String secondPercentStr = df.format(BigDecimal.valueOf(secondPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        secondLevelNumDTO.setPercent(secondPercent);
+        secondLevelNumDTO.setPercentStr(secondPercentStr);
+        NumDTO thirdLevelNumDTO = new NumDTO();
+        thirdLevelNumDTO.setName("丙级病历");
+        thirdLevelNumDTO.setNum(thirdLevelNum);
+        thirdLevelNumDTO.setTotleNum(totleNum);
+        Double thirdPercent = BigDecimal.valueOf(1)
+                .subtract(BigDecimal.valueOf(firstPercent))
+                .subtract(BigDecimal.valueOf(secondPercent))
+                .doubleValue();
+        String thirdPercentStr = df.format(BigDecimal.valueOf(thirdPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        thirdLevelNumDTO.setPercent(thirdPercent);
+        thirdLevelNumDTO.setPercentStr(thirdPercentStr);
+        retList.add(totleNumDTO);
+        retList.add(firstLevelNumDTO);
+        retList.add(secondLevelNumDTO);
+        retList.add(thirdLevelNumDTO);
+        return retList;
+    }
+}

+ 63 - 0
src/main/java/com/diagbot/aggregate/ResultStatisticsAggregate.java

@@ -1,6 +1,8 @@
 package com.diagbot.aggregate;
 
 import com.diagbot.dto.NumDTO;
+import com.diagbot.dto.ResultDetailDTO;
+import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.QcCasesFacade;
 import com.diagbot.facade.QcresultInfoFacade;
 import com.diagbot.util.BeanUtil;
@@ -36,19 +38,26 @@ public class ResultStatisticsAggregate {
     private QcresultInfoFacade qcresultInfoFacade;
     @Autowired
     private QcCasesFacade qcCasesFacade;
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
 
     @DataProvider("setAllResult")
     public Map<String, Object> setAllResult(
             @InvokeParameter("filterVO") FilterVO filterVO,
+            @DataConsumer("getResultDept") List<ResultDetailDTO> results,
             @DataConsumer("entryCountGroupByEntry") List<NumDTO> entryList,
             @DataConsumer("entryCountGroupByCase") List<NumDTO> caseList) {
         Map<String, Object> retMap = new LinkedHashMap<>();
+        if (ListUtil.isNotEmpty(results)) {
+            retMap.put("各科室缺陷占比", results);
+        }
         if (ListUtil.isNotEmpty(caseList)) {
             retMap.put("各模块缺陷占比排行", caseList);
         }
         if (ListUtil.isNotEmpty(entryList)) {
             retMap.put("条目缺陷占比", entryList);
         }
+
         return retMap;
     }
 
@@ -178,4 +187,58 @@ public class ResultStatisticsAggregate {
         }
         return null;
     }
+
+    /**
+     * 各科室缺陷占比
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getResultDept")
+    public List<ResultDetailDTO> getResultDept(@InvokeParameter("filterVO") FilterVO filterVO) {
+        List<ResultDetailDTO> results2 = behospitalInfoFacade.resultStatisticsByDept2(filterVO);
+        if (ListUtil.isNotEmpty(results2)) {
+            int totle = results2
+                    .stream()
+                    .map(ResultDetailDTO::getNum)
+                    .reduce(0, Integer::sum);
+            results2.forEach(result -> {
+                Double percent = BigDecimal.valueOf(result.getNum())
+                        .divide(BigDecimal.valueOf(totle), 4, RoundingMode.HALF_UP)
+                        .doubleValue();
+                result.setPercent(percent);
+            });
+            List<ResultDetailDTO> retResults = Lists.newLinkedList();
+            if (results2.size() <= 10) {
+                retResults = BeanUtil.listCopyTo(results2, ResultDetailDTO.class);
+            } else {
+
+                Double rate = 0d;
+                Integer num = 0;
+                for (ResultDetailDTO result : results2) {
+                    if (retResults.size() < 9) {
+                        rate = BigDecimal.valueOf(rate)
+                                .add(BigDecimal.valueOf(Double.valueOf(result.getPercent())))
+                                .doubleValue();
+                        retResults.add(result);
+                    } else {
+                        num += result.getNum();
+                    }
+                }
+                ResultDetailDTO retResult = new ResultDetailDTO();
+                retResult.setName("其他");
+                retResult.setNum(num);
+                retResult.setPercent(BigDecimal.valueOf(1).subtract(BigDecimal.valueOf(rate)).doubleValue());
+                retResults.add(retResult);
+            }
+            retResults.forEach(result -> {
+                DecimalFormat df = new DecimalFormat("#0.00");
+                String percentStr
+                        = df.format(BigDecimal.valueOf(result.getPercent()).multiply(BigDecimal.valueOf(100))) + "%";
+                result.setPercentStr(percentStr);
+            });
+            return retResults;
+        }
+        return null;
+    }
 }

+ 10 - 201
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -1,23 +1,14 @@
 package com.diagbot.facade;
 
-import com.diagbot.dto.NumDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.HomePageFilterVO;
-import com.diagbot.vo.QcresultFilterVO;
 import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -29,126 +20,25 @@ import java.util.Map;
  */
 @Component
 public class ConsoleFacade {
-
-    @Autowired
-    private QcresultInfoFacade qcresultInfoFacade;
     @Autowired
-    private BehospitalInfoFacade behospitalInfoFacade;
+    private FilterFacade filterFacade;
     @Autowired
     private DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
 
-
     /**
-     * 出院人数统计
+     * 病历相关统计
      *
      * @param filterVO
      * @return
      */
-    public Map<String, Object> leaveHosStatistics(FilterVO filterVO) {
-        Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        retMap.put("总人数", 0);
-        retMap.put("死亡人数", 0);
-        retMap.put("新生儿人数", 0);
-        retMap.put("手术病人数", 0);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setStartDate(getStartDateStr(filterVO.getType(), null));
-        filterVO.setEndDate(getEndDateStr(filterVO.getType(), null));
-        HomePageFilterVO homePageFilterVO = new HomePageFilterVO();
-        BeanUtil.copyProperties(filterVO, homePageFilterVO);
-        Integer totleNum = behospitalInfoFacade.homePageCount(homePageFilterVO);
-        homePageFilterVO.setDeath(1);
-        Integer deathNum = behospitalInfoFacade.homePageCount(homePageFilterVO);
-        homePageFilterVO.setDeath(null);
-        homePageFilterVO.setNewBorn(1);
-        Integer newBornNum = behospitalInfoFacade.homePageCount(homePageFilterVO);
-        Integer operationNum = behospitalInfoFacade.homePageCountForOperation(filterVO);
-        retMap.put("总人数", totleNum);
-        retMap.put("死亡人数", deathNum);
-        retMap.put("新生儿人数", newBornNum);
-        retMap.put("手术病人数", operationNum);
-        return retMap;
-    }
-
-    /**
-     * 质控病历统计
-     *
-     * @return
-     */
     public Map<String, Object> mrStatistics(FilterVO filterVO) {
-        DecimalFormat df = new DecimalFormat("#0.00");
-        Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = getStartDateStr(filterVO.getType(), null);
-        String endDate = getEndDateStr(filterVO.getType(), null);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        filterVO.setHospitalId(hospitalId);
-        QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
-        BeanUtil.copyProperties(filterVO, qcresultFilterVO);
-
-        int totleNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
-        qcresultFilterVO.setLevel("甲");
-        int firstLevelNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
-        qcresultFilterVO.setLevel("乙");
-        int secondLevelNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
-        qcresultFilterVO.setLevel("丙");
-        int thirdLevelNum = qcresultInfoFacade.resultCount(qcresultFilterVO);
-        NumDTO totleNumDTO = new NumDTO();
-        totleNumDTO.setName("累计质控病历数");
-        totleNumDTO.setTotleNum(totleNum);
-        totleNumDTO.setNum(totleNum);
-        NumDTO firstLevelNumDTO = new NumDTO();
-        firstLevelNumDTO.setName("甲级病历");
-        firstLevelNumDTO.setNum(firstLevelNum);
-        firstLevelNumDTO.setTotleNum(totleNum);
-        Double firstPercent = BigDecimal.valueOf(firstLevelNum)
-                .divide(BigDecimal.valueOf(totleNum), 4, RoundingMode.HALF_UP)
-                .doubleValue();
-        String firstPercentStr = df.format(BigDecimal.valueOf(firstPercent).multiply(BigDecimal.valueOf(100))) + "%";
-        firstLevelNumDTO.setPercent(firstPercent);
-        firstLevelNumDTO.setPercentStr(firstPercentStr);
-        NumDTO secondLevelNumDTO = new NumDTO();
-        secondLevelNumDTO.setName("乙级病历");
-        secondLevelNumDTO.setNum(secondLevelNum);
-        secondLevelNumDTO.setTotleNum(totleNum);
-        Double secondPercent = BigDecimal.valueOf(secondLevelNum)
-                .divide(BigDecimal.valueOf(totleNum), 4, RoundingMode.HALF_UP)
-                .doubleValue();
-        String secondPercentStr = df.format(BigDecimal.valueOf(secondPercent).multiply(BigDecimal.valueOf(100))) + "%";
-        secondLevelNumDTO.setPercent(secondPercent);
-        secondLevelNumDTO.setPercentStr(secondPercentStr);
-        NumDTO thirdLevelNumDTO = new NumDTO();
-        thirdLevelNumDTO.setName("丙级病历");
-        thirdLevelNumDTO.setNum(thirdLevelNum);
-        thirdLevelNumDTO.setTotleNum(totleNum);
-        Double thirdPercent = BigDecimal.valueOf(1)
-                .subtract(BigDecimal.valueOf(firstPercent))
-                .subtract(BigDecimal.valueOf(secondPercent))
-                .doubleValue();
-        String thirdPercentStr = df.format(BigDecimal.valueOf(thirdPercent).multiply(BigDecimal.valueOf(100))) + "%";
-        thirdLevelNumDTO.setPercent(thirdPercent);
-        thirdLevelNumDTO.setPercentStr(thirdPercentStr);
-        retMap.put("累计质控病历数", totleNumDTO);
-        retMap.put("甲级病历", firstLevelNumDTO);
-        retMap.put("乙级病历", secondLevelNumDTO);
-        retMap.put("丙级病历", thirdLevelNumDTO);
-        return retMap;
-    }
-
-    /**
-     * 科室相关统计
-     *
-     * @param filterVO
-     * @return
-     */
-    public Map<String, Object> deptStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
+        retMap.put("病历数统计", Lists.newLinkedList());
+        retMap.put("出院人数统计", new LinkedHashMap<>());
         retMap.put("各科室甲级病历占比", Lists.newLinkedList());
-        retMap.put("各科室缺陷占比", Lists.newLinkedList());
         String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = getStartDateStr(filterVO.getType(), null);
-        String endDate = getEndDateStr(filterVO.getType(), null);
+        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
+        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
         filterVO.setStartDate(startDate);
         filterVO.setEndDate(endDate);
         filterVO.setHospitalId(hospitalId);
@@ -156,7 +46,7 @@ public class ConsoleFacade {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("filterVO", filterVO);
             retMap
-                    = dataBeanAggregateQueryFacade.get("setAllDept", invokeParams, Map.class);
+                    = dataBeanAggregateQueryFacade.get("setAllMr", invokeParams, Map.class);
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
@@ -171,10 +61,11 @@ public class ConsoleFacade {
      */
     public Map<String, Object> resultStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
+        retMap.put("各科室缺陷占比", Lists.newLinkedList());
         retMap.put("各模块缺陷占比排行", Lists.newLinkedList());
         retMap.put("条目缺陷占比", Lists.newLinkedList());
         String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = getStartDateStr(filterVO.getType(), null);
+        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
         filterVO.setStartDate(startDate);
         filterVO.setHospitalId(hospitalId);
         try {
@@ -201,7 +92,7 @@ public class ConsoleFacade {
         retMap.put("各科室质控平均分", Lists.newLinkedList());
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         filterVO.setHospitalId(hospitalId);
-        String startDate = getStartDateStr(filterVO.getType(), null);
+        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
         filterVO.setStartDate(startDate);
         try {
             Map<String, Object> invokeParams = new HashMap<>();
@@ -211,88 +102,6 @@ public class ConsoleFacade {
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
-
         return retMap;
     }
-
-    /**
-     * 筛选起始时间
-     *
-     * @param type
-     * @return
-     */
-    public String getStartDateStr(Integer type, Integer optYear) {
-        Date date = new Date();
-        String startDate = "";
-        String year = optYear == null ? DateUtil.getYear(date) : optYear.toString();
-        int month = DateUtil.getMonth(date);
-        if (type.equals(1)) {
-            //本月统计
-            startDate = year + "-" + month + "-1";
-        } else if (type.equals(2)) {
-            //本年统计
-            startDate = year + "-1-1";
-        }
-        return startDate;
-    }
-
-    /**
-     * 筛选截止时间
-     *
-     * @param type
-     * @return
-     */
-    public String getEndDateStr(Integer type, Integer optYear) {
-        Date date = new Date();
-        String endDate = "";
-        String year = optYear == null ? DateUtil.getYear(date) : optYear.toString();
-        int month = DateUtil.getMonth(date);
-        if (type.equals(1)) {
-            //本月统计
-            if (month == 12) {
-                endDate = (Integer.valueOf(year) + 1) + "-1-1";
-            } else {
-                endDate = year + "-" + (month + 1) + "-1";
-            }
-        } else if (type.equals(2)) {
-            //本年统计
-            endDate = (Integer.valueOf(year) + 1) + "-1-1";
-        }
-        return endDate;
-    }
-
-    /**
-     * 上一统计周期(上月/去年)的起始时间
-     *
-     * @param type
-     * @return
-     */
-    public String getLastStartDateStr(Integer type) {
-        Date date = new Date();
-        String dateStr = "";
-        String year = DateUtil.getYear(date);
-        int month = DateUtil.getMonth(date);
-        if (type.equals(1)) {
-            if (month == 1) {
-                dateStr = (Integer.valueOf(year) - 1) + "-12-1";
-            } else {
-                dateStr = year + "-" + (month - 1) + "-1";
-            }
-        } else if (type.equals(2)) {
-            dateStr = (Integer.valueOf(year) - 1) + "-1-1";
-        }
-        return dateStr;
-    }
-
-    /**
-     * 获取上一统计周期(上月/去年)的起始时间
-     *
-     * @param type
-     * @return
-     */
-    public String getLastEndDateStr(Integer type) {
-        //上一统计周期的截止时间等于本周期的起始时间
-        return getStartDateStr(type, null);
-    }
-
 }

+ 94 - 0
src/main/java/com/diagbot/facade/FilterFacade.java

@@ -0,0 +1,94 @@
+package com.diagbot.facade;
+
+import com.diagbot.util.DateUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/5/7 13:53
+ */
+@Component
+public class FilterFacade {
+    /**
+     * 筛选起始时间
+     *
+     * @param type
+     * @return
+     */
+    public String getStartDateStr(Integer type, Integer optYear) {
+        Date date = new Date();
+        String startDate = "";
+        String year = optYear == null ? DateUtil.getYear(date) : optYear.toString();
+        int month = DateUtil.getMonth(date);
+        if (type.equals(1)) {
+            //本月统计
+            startDate = year + "-" + month + "-1";
+        } else if (type.equals(2)) {
+            //本年统计
+            startDate = year + "-1-1";
+        }
+        return startDate;
+    }
+
+    /**
+     * 筛选截止时间
+     *
+     * @param type
+     * @return
+     */
+    public String getEndDateStr(Integer type, Integer optYear) {
+        Date date = new Date();
+        String endDate = "";
+        String year = optYear == null ? DateUtil.getYear(date) : optYear.toString();
+        int month = DateUtil.getMonth(date);
+        if (type.equals(1)) {
+            //本月统计
+            if (month == 12) {
+                endDate = (Integer.valueOf(year) + 1) + "-1-1";
+            } else {
+                endDate = year + "-" + (month + 1) + "-1";
+            }
+        } else if (type.equals(2)) {
+            //本年统计
+            endDate = (Integer.valueOf(year) + 1) + "-1-1";
+        }
+        return endDate;
+    }
+
+    /**
+     * 上一统计周期(上月/去年)的起始时间
+     *
+     * @param type
+     * @return
+     */
+    public String getLastStartDateStr(Integer type) {
+        Date date = new Date();
+        String dateStr = "";
+        String year = DateUtil.getYear(date);
+        int month = DateUtil.getMonth(date);
+        if (type.equals(1)) {
+            if (month == 1) {
+                dateStr = (Integer.valueOf(year) - 1) + "-12-1";
+            } else {
+                dateStr = year + "-" + (month - 1) + "-1";
+            }
+        } else if (type.equals(2)) {
+            dateStr = (Integer.valueOf(year) - 1) + "-1-1";
+        }
+        return dateStr;
+    }
+
+    /**
+     * 获取上一统计周期(上月/去年)的起始时间
+     *
+     * @param type
+     * @return
+     */
+    public String getLastEndDateStr(Integer type) {
+        //上一统计周期的截止时间等于本周期的起始时间
+        return getStartDateStr(type, null);
+    }
+}

+ 0 - 18
src/main/java/com/diagbot/web/ConsoleController.java

@@ -54,22 +54,4 @@ public class ConsoleController {
         Map<String, Object> data = consoleFacade.averageStatistics(filterVO);
         return RespDTO.onSuc(data);
     }
-
-    @ApiOperation(value = "科室相关统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
-    @PostMapping("/deptStatistics")
-    @SysLogger("deptStatistics")
-    public RespDTO<Map<String, Object>> deptStatistics(@RequestBody FilterVO filterVO) {
-        Map<String, Object> data = consoleFacade.deptStatistics(filterVO);
-        return RespDTO.onSuc(data);
-    }
-
-    @ApiOperation(value = "出院相关统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
-    @PostMapping("/leaveHosStatistics")
-    @SysLogger("leaveHosStatistics")
-    public RespDTO<Map<String, Object>> leaveHosStatistics(@RequestBody FilterVO filterVO) {
-        Map<String, Object> data = consoleFacade.leaveHosStatistics(filterVO);
-        return RespDTO.onSuc(data);
-    }
 }