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

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

@@ -95,12 +95,12 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 最后得分
      */
-    private String scoreRes;
+    private Double scoreRes;
 
     /**
      * 病案首页得分
      */
-    private String scoreBn;
+    private Double scoreBn;
 
     /**
      * 评分类型(1：机器，2：人工)

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

@@ -56,7 +56,7 @@ public class HomePageNumDTO {
     /**
      * 病案首页合格病历数
      */
-    @Excel(name = "合格数", orderNum = "5")
+    @Excel(name = "合格数", orderNum = "4")
     private Integer firstLevelNum = 0;
     /**
      * 病案首页合格病历占比
@@ -69,7 +69,7 @@ public class HomePageNumDTO {
     /**
      * 病案首页合格病历占比（百分比）
      */
-    @Excel(name = "合格率", orderNum = "4")
+    @Excel(name = "合格率", orderNum = "5")
     private String firstLevelPercentStr = "0.00%";
     /**
      * 病案首页不合格病历占比（百分比）