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

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

@@ -27,9 +27,9 @@ public class ExportExcelBehospitalDTO {
     @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
     private Date leaveHospitalDate;
     @Excel(name = "分数", needMerge = true)
-    private String score;
+    private Double score;
     @Excel(name = "病案首页分数", needMerge = true)
-    private String scoreBn;
+    private Double scoreBn;
     @ExcelCollection(name = "")
     private List<ExportExcelCaseDTO> exportExcelCaseDTOS;
 

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

@@ -18,7 +18,7 @@ public class ExportExcelDTO {
     @Excel(name = "科室", needMerge = true)
     private String behDeptName;
     @Excel(name = "平均分数", needMerge = true)
-    private String avgScore;
+    private Double avgScore;
     @ExcelCollection(name = "")
     private List<ExportExcelBehospitalDTO> excelBehospitalDTOS;
 

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

@@ -817,10 +817,12 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptStr_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
+        if( StringUtil.isBlank(filterOrderVO.getName())){
             LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
             if (item != null) {
                 records.add(0, item);
             }
+        }
         if(ListUtil.isNotEmpty(records)){
            for (LevelStatisticsTZDTO record : records) {
                BigDecimalStrExport(record);
@@ -839,11 +841,14 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
-            LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
-            if (item != null) {
-                records.add(0, item);
+            if( StringUtil.isBlank(filterOrderVO.getName())){
+                LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
+                if (item != null) {
+                    records.add(0, item);
+                }
             }
 
+
         if(ListUtil.isNotEmpty(records)){
             for (LevelStatisticsTZDTO record : records) {
                 BigDecimalMethod(record);