控制台-统计相关

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -46,7 +46,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> mrStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        retMap.put("本月病历数", 0);
+        /*retMap.put("本月病历数", 0);
         retMap.put("本月质控数-人工", 0);
         retMap.put("本月质控数-机器", 0);
         retMap.put("本月甲级病历-人工", 0);
@@ -54,7 +54,7 @@ public class ConsoleFacade {
         retMap.put("本月乙级病历-人工", 0);
         retMap.put("本月乙级病历-机器", 0);
         retMap.put("本月不合格病历-人工", 0);
-        retMap.put("本月不合格病历-机器", 0);
+        retMap.put("本月不合格病历-机器", 0);*/
 
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String startDate = getStartDateStr(filterVO.getType());
@@ -66,52 +66,87 @@ public class ConsoleFacade {
                 .eq("hospital_id", hospitalId)
                 .ge("leave_hospital_date", startDate);
         int behospitalInfoCount = behospitalInfoFacade.count(behospitalInfoQueryWrapper);
-        //本月病历数
-        retMap.put("本月病历数", behospitalInfoCount);
-
+        //病历数
+        if (filterVO.getType().equals(1)) {
+            retMap.put("本月病历数", behospitalInfoCount);
+        } else if (filterVO.getType().equals(2)) {
+            retMap.put("本年病历数", behospitalInfoCount);
+        }
 
         QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
-        BeanUtil.copyProperties(qcresultFilterVO, filterVO);
+        BeanUtil.copyProperties(filterVO, qcresultFilterVO);
         //本月质控数-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("");
         int qcresultByGradeType2Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月质控数-人工", qcresultByGradeType2Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月质控数-人工", qcresultByGradeType2Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年质控数-人工", qcresultByGradeType2Count);
+        }
         //本月质控数-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("");
         int qcresultByGradeType1Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月质控数-机器", qcresultByGradeType1Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月质控数-机器", qcresultByGradeType1Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年质控数-机器", qcresultByGradeType1Count);
+        }
         //本月甲级病历-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("甲");
         int qcresultByGradeType2AndLevel1Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月甲级病历-人工", qcresultByGradeType2AndLevel1Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月甲级病历-人工", qcresultByGradeType2AndLevel1Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年甲级病历-人工", qcresultByGradeType2AndLevel1Count);
+        }
         //本月甲级病历-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("甲");
         int qcresultByGradeType1AndLevel1Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月甲级病历-机器", qcresultByGradeType1AndLevel1Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月甲级病历-机器", qcresultByGradeType1AndLevel1Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年甲级病历-机器", qcresultByGradeType1AndLevel1Count);
+        }
         //本月乙级病历-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("乙");
         int qcresultByGradeType2AndLevel2Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月乙级病历-人工", qcresultByGradeType2AndLevel2Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月乙级病历-人工", qcresultByGradeType2AndLevel2Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年乙级病历-人工", qcresultByGradeType2AndLevel2Count);
+        }
         //本月乙级病历-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("乙");
         int qcresultByGradeType1AndLevel2Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月乙级病历-机器", qcresultByGradeType1AndLevel2Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月乙级病历-机器", qcresultByGradeType1AndLevel2Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年乙级病历-机器", qcresultByGradeType1AndLevel2Count);
+        }
         //本月乙级病历-人工
         qcresultFilterVO.setGradeType(2);
         qcresultFilterVO.setLevel("丙");
         int qcresultByGradeType2AndLevel3Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+        if (qcresultFilterVO.getType().equals(1)) {
+            retMap.put("本月不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+        } else if (qcresultFilterVO.getType().equals(2)) {
+            retMap.put("本年不合格病历-人工", qcresultByGradeType2AndLevel3Count);
+        }
         //本月乙级病历-机器
         qcresultFilterVO.setGradeType(1);
         qcresultFilterVO.setLevel("丙");
         int qcresultByGradeType1AndLevel3Count = qcresultInfoFacade.getQcresultSelectively(qcresultFilterVO);
-        retMap.put("本月不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+        if (filterVO.getType().equals(1)) {
+            retMap.put("本月不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+        } else if (filterVO.getType().equals(2)) {
+            retMap.put("本年不合格病历-机器", qcresultByGradeType1AndLevel3Count);
+        }
         return retMap;
     }