Merge remote-tracking branch 'origin/dev/20200426_2nd' into test

src/main/java/com/diagbot/aggregate/ResultStatisticsAggregate.java

@@ -146,6 +146,7 @@ public class ResultStatisticsAggregate {
                     .reduce(0, Integer::sum);
             List<NumDTO> retList = Lists.newLinkedList();
             numDTOList.forEach(numDTO -> {
+                numDTO.setTotleNum(totle);
                 Double percent = BigDecimal.valueOf(numDTO.getNum())
                         .divide(BigDecimal.valueOf(totle), 4, RoundingMode.HALF_UP)
                         .doubleValue();
@@ -178,7 +179,7 @@ public class ResultStatisticsAggregate {
                         otherNumDTO.setName("其他");
                         otherNumDTO.setNum(num);
                         otherNumDTO.setTotleNum(totle);
-                        Double percent = BigDecimal.valueOf(numDTO.getNum())
+                        Double percent = BigDecimal.valueOf(num)
                                 .divide(BigDecimal.valueOf(totle), 4, RoundingMode.HALF_UP)
                                 .doubleValue();
                         otherNumDTO.setPercent(percent);

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

@@ -124,7 +124,7 @@ public class ConsoleByDeptFacade {
         //质控病历总数
         List<NumDTO> totleNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterByDeptVO);
         Map<String, NumDTO> totleMap = ListUtil.isEmpty(totleNumList)
-                ? null
+                ? new HashMap<>()
                 : EntityUtil.makeEntityMap(totleNumList, "name");
         //甲级病历
         qcresultFilterByDeptVO.setLevel("甲");
@@ -162,6 +162,11 @@ public class ConsoleByDeptFacade {
             if (thirdMap.containsKey(deptName)) {
                 thirdLevelNum = thirdMap.get(deptName).getNum();
             }
+            //总病历数为0
+            if (totleNum == 0) {
+                retMap.put(deptName, Lists.newLinkedList());
+                continue;
+            }
             NumDTO totleNumDTO = new NumDTO();
             totleNumDTO.setName("累计质控病历数");
             totleNumDTO.setTotleNum(totleNum);
@@ -250,7 +255,7 @@ public class ConsoleByDeptFacade {
                 continue;
             }
             //病历数
-            Integer mrNum = mrMap.get(deptMap).getNum();
+            Integer mrNum = mrMap.get(deptName).getNum();
             //没有缺陷
             if (!qcEntryMap.containsKey(deptName)) {
                 retMap.put(deptName, Lists.newLinkedList());

src/main/java/com/diagbot/vo/FilterByDeptVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,5 +12,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class FilterByDeptVO extends FilterVO {
+    @ApiModelProperty(hidden = true)
     private Long userId;
 }

src/main/java/com/diagbot/vo/QcresultFilterByDeptVO.java

@@ -10,7 +10,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QcresultFilterByDeptVO {
+public class QcresultFilterByDeptVO extends FilterByDeptVO{
     /**
      * 等级
      */