Merge remote-tracking branch 'origin/dev/20201021_1.4.7' into test

src/main/java/com/diagbot/dto/HomePageNumDTO.java

@@ -42,7 +42,7 @@ public class HomePageNumDTO {
     /**
      * 质控病历数
      */
-    @Excel(name = "质控病历数", orderNum = "10")
+    @Excel(name = "质控病历数", orderNum = "11")
     private Integer mrNum = 0;
     /**
      * 质控评分（总分）
@@ -51,11 +51,12 @@ public class HomePageNumDTO {
     /**
      * 质控评分（平均分）
      */
-    @Excel(name = "质控平均分", orderNum = "9")
+    @Excel(name = "质控平均分", orderNum = "10")
     private Double averageValue = 0d;
     /**
      * 病案首页合格病历数
      */
+    @Excel(name = "合格数", orderNum = "5")
     private Integer firstLevelNum = 0;
     /**
      * 病案首页合格病历占比
@@ -85,12 +86,12 @@ public class HomePageNumDTO {
     /**
      * 空项数
      */
-    @Excel(name = "空项数", orderNum = "5")
+    @Excel(name = "空项数", orderNum = "6")
     private Integer emptyNum = 0;
     /**
      * 错误数
      */
-    @Excel(name = "错误数", orderNum = "7")
+    @Excel(name = "错误数", orderNum = "8")
     private Integer errorNum = 0;
     /**
      * 完整率、完善率分母（质控病历数*病案首页条目数）
@@ -107,11 +108,11 @@ public class HomePageNumDTO {
     /**
      * 完整率（百分比）
      */
-    @Excel(name = "完整率", orderNum = "6")
+    @Excel(name = "完整率", orderNum = "7")
     private String emptyPercentStr = "0.00%";
     /**
      * 完善率（百分比）
      */
-    @Excel(name = "完善率", orderNum = "8")
+    @Excel(name = "完善率", orderNum = "9")
     private String errorPercentStr = "0.00%";
 }

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

@@ -1010,14 +1010,14 @@ public class ConsoleFacade {
                     = df.format(BigDecimal.valueOf(sameThirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
         }
 
-        if (StringUtil.isBlank(filterOrderVO.getDeptClass()) || filterOrderVO.getDeptClass().equals("全院")) {
-        item.setDeptName("全院");
-         }else if("内科".equals(filterOrderVO.getDeptClass())){
-        item.setDeptName("内科系统");
+        if("内科".equals(filterOrderVO.getDeptClass())){
+            item.setDeptClassId("01");
+            item.setDeptClass("内科");
         }else if("外科".equals(filterOrderVO.getDeptClass())){
-        item.setDeptName("外科系统");
-     }
-
+            item.setDeptClassId("1030000");
+            item.setDeptClass("外科");
+        }
+        item.setDeptName("全院");
         item.setEntryNum(entryNum);
         item.setSameNum(sameNum);
         item.setMrNum(mrNum);