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

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

@@ -817,13 +817,10 @@ 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()) || filterOrderVO.getName().equals("全院")) {
-            LevelStatisticsTZDTO item = getGlobleRecords(records);
+            LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
             if (item != null) {
                 records.add(0, item);
             }
-        }
         if(ListUtil.isNotEmpty(records)){
            for (LevelStatisticsTZDTO record : records) {
                BigDecimalStrExport(record);
@@ -842,13 +839,11 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
-        //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
-            LevelStatisticsTZDTO item = getGlobleRecords(records);
+            LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
             if (item != null) {
                 records.add(0, item);
             }
-        }
+
         if(ListUtil.isNotEmpty(records)){
             for (LevelStatisticsTZDTO record : records) {
                 BigDecimalMethod(record);
@@ -864,7 +859,7 @@ public class ConsoleFacade {
      * @param records
      * @return
      */
-    public LevelStatisticsTZDTO getGlobleRecords(List<LevelStatisticsTZDTO> records) {
+    public LevelStatisticsTZDTO getGlobleRecords(List<LevelStatisticsTZDTO> records,FilterOrderVO filterOrderVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         LevelStatisticsTZDTO item = new LevelStatisticsTZDTO();
         if (ListUtil.isEmpty(records)) {
@@ -1014,7 +1009,14 @@ public class ConsoleFacade {
              sameThirdLevelPercentStr
                     = df.format(BigDecimal.valueOf(sameThirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
         }
-        item.setDeptName("全院");
+        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+            item.setDeptName("全院");
+        }else if("内科".equals(filterOrderVO.getName())){
+            item.setDeptName("内科系统");
+        }else if("外科".equals(filterOrderVO.getName())){
+            item.setDeptName("外科系统");
+        }
+
         item.setEntryNum(entryNum);
         item.setSameNum(sameNum);
         item.setMrNum(mrNum);