各科室同比占比

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

@@ -458,7 +458,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
-        filterFacade.filterOrderVOSet(filterOrderVO);
+        filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
         return records;
     }

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

@@ -86,6 +86,29 @@ public class FilterFacade {
         return dateStr;
     }
 
+    /**
+     * 获取上一年同期开始结束时间
+     *
+     * @param type
+     * @return
+     */
+//    public String getLastStartDateStr(Integer type) {
+//        Date date = new Date();
+//        String dateStr = "";
+//        String year = DateUtil.getYear(date);
+//        int month = DateUtil.getMonth(date);
+//        if (type.equals(1)) {
+//            if (month == 1) {
+//                dateStr = (Integer.valueOf(year) - 1) + "-12-1";
+//            } else {
+//                dateStr = year + "-" + (month - 1) + "-1";
+//            }
+//        } else if (type.equals(2)) {
+//            dateStr = (Integer.valueOf(year) - 1) + "-1-1";
+//        }
+//        return dateStr;
+//    }
+
     /**
      * 获取上一统计周期（上月/去年）的起始时间
      *
@@ -97,6 +120,30 @@ public class FilterFacade {
         return getStartDateStr(type, null);
     }
 
+    /**
+     * 入参拼接-同比
+     *
+     * @param filterVO
+     */
+    public void filterVOSetSame(FilterVO filterVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
+        }
+        if (StringUtil.isBlank(filterVO.getStartDate())) {
+            String startDate = getStartDateStr(filterVO.getType(), null);
+
+            filterVO.setStartDate(startDate);
+        }
+        if (StringUtil.isBlank(filterVO.getEndDate())) {
+            String endDate = getEndDateStr(filterVO.getType(), null);
+            filterVO.setEndDate(endDate);
+        }
+    }
+
     /**
      * 入参拼接
      *
@@ -193,6 +240,24 @@ public class FilterFacade {
     /**
      * 过滤条件设置
      *
+     * @param filterOrderVO
+     */
+    public void filterOrderVOSame(FilterOrderVO filterOrderVO) {
+        FilterVO filterVO = new FilterVO();
+        BeanUtil.copyProperties(filterOrderVO, filterVO);
+        filterVOSetSame(filterVO);
+//        filterOrderVO.setLastStartDate();
+//        filterOrderVO.setLastEndDate();
+        filterOrderVO.setHospitalId(filterVO.getHospitalId());
+        filterOrderVO.setUserId(filterVO.getUserId());
+        filterOrderVO.setStartDate(filterVO.getStartDate());
+        filterOrderVO.setEndDate(filterVO.getEndDate());
+        filterOrderVO.setLimitCount(filterVO.getLimitCount());
+    }
+
+    /**
+     * 过滤条件设置-同比
+     *
      * @param filterOrderByDeptVO
      */
     public void filterOrderByDeptVOSet(FilterOrderByDeptVO filterOrderByDeptVO) {

src/main/java/com/diagbot/vo/FilterOrderVO.java

@@ -30,4 +30,12 @@ public class FilterOrderVO extends FilterVO {
      * 科室名称/主管医生名称
      */
     private String name;
-}
+    /**
+     * 去年同期起始时间
+     */
+    private String lastStartDate;
+    /**
+     * 去年同期结束时间
+     */
+    private String lastEndDate;
+}