病案首页

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

@@ -593,9 +593,13 @@ public class ConsoleByDeptFacade {
         filterOrderByDeptVO.setHospitalId(hosptialId);
         filterOrderByDeptVO.setUserId(Long.valueOf(userId));
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
-        HomePageNumDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
-        if (item != null) {
-            records.add(0, item);
+        //没有医生过滤时增加全科室数据
+        if (StringUtil.isBlank(filterOrderByDeptVO.getName())
+                || filterOrderByDeptVO.getName().equals(filterOrderByDeptVO.getDeptName())) {
+            HomePageNumDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
+            if (item != null) {
+                records.add(0, item);
+            }
         }
         return records;
     }

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

@@ -595,9 +595,12 @@ public class ConsoleFacade {
         filterOrderVO.setEndDate(endDate);
         filterOrderVO.setHospitalId(hosptialId);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
-        HomePageNumDTO item = getGlobleRecord(records);
-        if (item != null) {
-            records.add(0, item);
+        //没有科室过滤时增加全院数据
+        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+            HomePageNumDTO item = getGlobleRecord(records);
+            if (item != null) {
+                records.add(0, item);
+            }
         }
         return records;
     }