Merge branch 'dev/29290610_1.3.3' into test

doc/008.20200610v1.3.3/qc_initv1.3.3.sql

@@ -0,0 +1,8 @@
+use `qc`;
+
+ALTER TABLE `med_behospital_info` ADD `placefile_date` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '归档时间' AFTER `is_placefile`;
+
+UPDATE `med_behospital_info` set `placefile_date` = date_add(leave_hospital_date,interval 3 day) where leave_hospital_date is not null;
+
+--  【已执行】 2020-06-11
+-- INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('290', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', 'leaveHospitalType', '出院情况', '2', '0', '病案首页诊断信息');

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

@@ -106,4 +106,9 @@ public class BehospitalInfoDTO implements Serializable {
     private String directorDoctorName ;
 
     private String behDoctorName;
+
+    /**
+     * 归档时间
+     */
+    private Date placefileDate;
 }

src/main/java/com/diagbot/entity/BehospitalInfo.java

@@ -153,6 +153,11 @@ public class BehospitalInfo implements Serializable {
      */
     private String isPlacefile;
 
+    /**
+     * 归档时间
+     */
+    private Date placefileDate;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */
@@ -386,6 +391,14 @@ public class BehospitalInfo implements Serializable {
         this.isPlacefile = isPlacefile;
     }
 
+    public Date getPlacefileDate() {
+        return placefileDate;
+    }
+
+    public void setPlacefileDate(Date placefileDate) {
+        this.placefileDate = placefileDate;
+    }
+
     public String getIsDeleted() {
         return isDeleted;
     }

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

@@ -8,7 +8,6 @@ import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
@@ -26,7 +25,6 @@ import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -60,14 +58,7 @@ public class ConsoleByDeptFacade {
      */
     public Map<String, Object> leaveHosCountByDept(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
+        filterFacade.filterVOSet(filterVO);
         //关联科室
         Map<String, Object> deptMap = getDeptByUser(filterVO);
         if (deptMap == null) {
@@ -122,14 +113,7 @@ public class ConsoleByDeptFacade {
     public Map<String, Object> mrCountByDept(FilterVO filterVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
+        filterFacade.filterVOSet(filterVO);
         QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
         BeanUtil.copyProperties(filterVO, qcresultFilterVO);
         //关联科室
@@ -235,14 +219,7 @@ public class ConsoleByDeptFacade {
     public Map<String, Object> entryCountGroupByCaseAndDept(FilterVO filterVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
+        filterFacade.filterVOSet(filterVO);
         if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
             filterVO.setLimitCount(10);
         }
@@ -339,17 +316,7 @@ public class ConsoleByDeptFacade {
      */
     public Map<String, Object> entryCountGroupByEntryAndDept(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         Integer limitCount = filterVO.getLimitCount();
         //关联科室
         Map<String, Object> deptMap = getDeptByUser(filterVO);
@@ -417,54 +384,6 @@ public class ConsoleByDeptFacade {
     }
 
 
-    /**
-     * 过滤条件设置
-     *
-     * @param filterPageByDeptVO
-     */
-    private void filterPageByDeptVOSet(FilterPageByDeptVO filterPageByDeptVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = "";
-        String endDate = "";
-        Date date = new Date();
-
-        //统计维度 1-本月，2-本年
-        //时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
-        if (filterPageByDeptVO.getType().equals(1)) {
-            if (filterPageByDeptVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            } else if (filterPageByDeptVO.getDateType().equals(2)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageByDeptVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageByDeptVO.getType());
-            } else if (filterPageByDeptVO.getDateType().equals(3)) {
-                String year = DateUtil.getYear(date);
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            }
-        } else if (filterPageByDeptVO.getType().equals(2)) {
-            if (filterPageByDeptVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            } else if (filterPageByDeptVO.getDateType().equals(2) || filterPageByDeptVO.getDateType().equals(3)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageByDeptVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageByDeptVO.getType());
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            }
-        }
-
-        filterPageByDeptVO.setStartDate(startDate);
-        filterPageByDeptVO.setEndDate(endDate);
-        filterPageByDeptVO.setHospitalId(hospitalId);
-        filterPageByDeptVO.setUserId(Long.valueOf(userId));
-    }
-
     /**
      * 各模块缺陷占比-科室（分页）
      *
@@ -479,7 +398,7 @@ public class ConsoleByDeptFacade {
                 filterPageByDeptVO.setDeptName(deptList.get(0).getDeptName());
             }
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptNumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
         return page;
     }
@@ -501,7 +420,7 @@ public class ConsoleByDeptFacade {
         if (filterPageByDeptVO.getDeptName().equals(filterPageByDeptVO.getDoctorName())) {
             filterPageByDeptVO.setDoctorName("");
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
         return page;
     }
@@ -520,7 +439,7 @@ public class ConsoleByDeptFacade {
                 filterPageByDeptVO.setDeptName(deptList.get(0).getDeptName());
             }
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptNumDTO> page = behospitalInfoFacade.resultStatisticsByDeptAndDoctorPage(filterPageByDeptVO);
         return page;
     }
@@ -539,7 +458,7 @@ public class ConsoleByDeptFacade {
                 filterPageByDeptVO.setDeptName(deptList.get(0).getDeptName());
             }
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryGroupByEntryAndDeptInnerPage(filterPageByDeptVO);
         return page;
     }
@@ -558,14 +477,7 @@ public class ConsoleByDeptFacade {
         if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())) {
             filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
         }
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterOrderByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderByDeptVO.getType(), null);
-        filterOrderByDeptVO.setStartDate(startDate);
-        filterOrderByDeptVO.setEndDate(endDate);
-        filterOrderByDeptVO.setHospitalId(hosptialId);
-        filterOrderByDeptVO.setUserId(Long.valueOf(userId));
+        filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatisticsByDept(filterOrderByDeptVO);
         return records;
     }
@@ -584,14 +496,7 @@ public class ConsoleByDeptFacade {
         if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())) {
             filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
         }
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterOrderByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderByDeptVO.getType(), null);
-        filterOrderByDeptVO.setStartDate(startDate);
-        filterOrderByDeptVO.setEndDate(endDate);
-        filterOrderByDeptVO.setHospitalId(hosptialId);
-        filterOrderByDeptVO.setUserId(Long.valueOf(userId));
+        filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
         //没有医生过滤时增加全科室数据
         if (StringUtil.isBlank(filterOrderByDeptVO.getName())
@@ -619,14 +524,7 @@ public class ConsoleByDeptFacade {
         if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())) {
             filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
         }
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterOrderByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderByDeptVO.getType(), null);
-        filterOrderByDeptVO.setStartDate(startDate);
-        filterOrderByDeptVO.setEndDate(endDate);
-        filterOrderByDeptVO.setHospitalId(hosptialId);
-        filterOrderByDeptVO.setUserId(Long.valueOf(userId));
+        filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         if (filterOrderByDeptVO.getLimitCount() == null || filterOrderByDeptVO.getLimitCount().equals(0)) {
             filterOrderByDeptVO.setLimitCount(10);
         }

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

@@ -13,10 +13,8 @@ import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
-import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.FilterOrderVO;
 import com.diagbot.vo.FilterPageByAverageVO;
 import com.diagbot.vo.FilterPageVO;
@@ -29,7 +27,6 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -71,15 +68,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> mrStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        filterVO.setHospitalId(hospitalId);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         try {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("filterVO", filterVO);
@@ -99,15 +88,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> resultStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         try {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("filterVO", filterVO);
@@ -127,15 +108,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> averageStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         try {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("filterVO", filterVO);
@@ -159,7 +132,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getAverageDayNum(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> averageDayNumList = averageStatisticsAggregate.getAverageDayNum(filterVO);
         if (ListUtil.isNotEmpty(averageDayNumList)) {
             retMap.put("平均住院日", averageDayNumList);
@@ -175,7 +148,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getAverageFee(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> averageFeeList = averageStatisticsAggregate.getAverageFee(filterVO);
         if (ListUtil.isNotEmpty(averageFeeList)) {
             retMap.put("平均住院费用", averageFeeList);
@@ -191,7 +164,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getAverageScore(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> averageScoreList = averageStatisticsAggregate.getAverageScore(filterVO);
         if (ListUtil.isNotEmpty(averageScoreList)) {
             retMap.put("各科室质控平均分", averageScoreList);
@@ -206,7 +179,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<AverageStatisticsDTO> getAverageScoreByDeptClass(FilterVO filterVO) {
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> retAverageScoreList = Lists.newLinkedList();
         List<AverageStatisticsDTO> averageScoreList = qcresultInfoFacade.getAverageScoreByDeptClass(filterVO);
         Integer limitCount = filterVO.getLimitCount();
@@ -225,7 +198,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getLevelResultDept(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<QcResultPercentDTO> levelResults = mrStatisticsAggregate.getLevelResultDept(filterVO);
         if (ListUtil.isNotEmpty(levelResults)) {
             retMap.put("各科室甲级病历占比", levelResults);
@@ -241,7 +214,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> leaveHosCount(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         Map<String, Object> leaveHosMap = mrStatisticsAggregate.leaveHosCount(filterVO);
         if (leaveHosMap != null) {
             retMap.put("出院人数统计", leaveHosMap);
@@ -257,7 +230,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> mrCount(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> mrCountList = mrStatisticsAggregate.mrCount(filterVO);
         if (ListUtil.isNotEmpty(mrCountList)) {
             retMap.put("病历数统计", mrCountList);
@@ -273,7 +246,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> entryCountGroupByCase(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> caseList = resultStatisticsAggregate.entryCountGroupByCase(filterVO);
         if (ListUtil.isNotEmpty(caseList)) {
             retMap.put("各模块缺陷占比排行", caseList);
@@ -289,7 +262,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> entryCountGroupByEntry(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> entryList = resultStatisticsAggregate.entryCountGroupByEntry(filterVO);
         if (ListUtil.isNotEmpty(entryList)) {
             retMap.put("条目缺陷占比", entryList);
@@ -305,7 +278,7 @@ public class ConsoleFacade {
      */
     public List<EntryNumDTO> entryRejectPercent(FilterVO filterVO) {
         List<EntryNumDTO> retList = Lists.newLinkedList();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         Integer limitCount = filterVO.getLimitCount();
         List<EntryNumDTO> numDTOList = qcresultInfoFacade.entryRejectPercent(filterVO);
         if (ListUtil.isNotEmpty(numDTOList)) {
@@ -329,7 +302,7 @@ public class ConsoleFacade {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入病历等级");
         }
         List<DeptNumDTO> retList = Lists.newLinkedList();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         Integer limitCount = filterVO.getLimitCount();
         List<DeptNumDTO> numDTOList = qcresultInfoFacade.qcResultLevelPercent(filterVO);
         if (ListUtil.isNotEmpty(numDTOList)) {
@@ -350,102 +323,17 @@ public class ConsoleFacade {
      */
     public Map<String, Object> entryByDept(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> deptList = resultStatisticsAggregate.entryByDept(filterVO);
         if (ListUtil.isNotEmpty(deptList)) {
             retMap.put("各科室缺陷占比", deptList);
         }
         return retMap;
     }
-
-    private void filterVOSet(FilterVO filterVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
-    }
     //endregion-----------------------单独接口结束-------------------------------
 
     //region_______________________分页接口开始-------------------------------
 
-    /**
-     * 过滤条件设置
-     *
-     * @param filterPageVO
-     */
-    private void filterPageVOSet(FilterPageVO filterPageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = "";
-        String endDate = "";
-        Date date = new Date();
-
-        //统计维度 1-本月，2-本年
-        //时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
-        if (filterPageVO.getType().equals(1)) {
-            if (filterPageVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            } else if (filterPageVO.getDateType().equals(2)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
-            } else if (filterPageVO.getDateType().equals(3)) {
-                String year = DateUtil.getYear(date);
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            }
-        } else if (filterPageVO.getType().equals(2)) {
-            if (filterPageVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            } else if (filterPageVO.getDateType().equals(2) || filterPageVO.getDateType().equals(3)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            }
-        }
-
-        filterPageVO.setStartDate(startDate);
-        filterPageVO.setEndDate(endDate);
-        filterPageVO.setHospitalId(hospitalId);
-    }
-
-    /**
-     * 平均住院天数、平均花费入参设置
-     *
-     * @param filterPageByAverageVO
-     */
-    private void filterPageByAverageVOSet(FilterPageByAverageVO filterPageByAverageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        Date date = new Date();
-        String year = DateUtil.getYear(date);
-        String startDate = filterFacade.getStartDateStr(filterPageByAverageVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterPageByAverageVO.getType(), null);
-        String lastStartDate = filterFacade.getLastStartDateStr(filterPageByAverageVO.getType());
-        String lastEndDate = filterFacade.getLastEndDateStr(filterPageByAverageVO.getType());
-        String lastYearStartDate = filterFacade.getStartDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
-        String lastYearEndDate = filterFacade.getEndDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
-        filterPageByAverageVO.setHospitalId(hospitalId);
-        filterPageByAverageVO.setUserId(Long.valueOf(userId));
-        filterPageByAverageVO.setStartDate(startDate);
-        filterPageByAverageVO.setEndDate(endDate);
-        filterPageByAverageVO.setLastStartDate(lastStartDate);
-        filterPageByAverageVO.setLastEndDate(lastEndDate);
-        filterPageByAverageVO.setLastYearStartDate(lastYearStartDate);
-        filterPageByAverageVO.setLastYearEndDate(lastYearEndDate);
-    }
 
     /**
      * 各模块缺陷占比（分页）
@@ -454,7 +342,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<NumDTO> entryCountGroupByCasePage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<NumDTO> page = qcresultInfoFacade.entryCountGroupByCasePage(filterPageVO);
         return page;
     }
@@ -466,7 +354,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<EntryNumDTO> entryCountGroupByEntryPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         if (filterPageVO.getDeptName().equals("全院")) {
             filterPageVO.setDeptName("");
         }
@@ -481,7 +369,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<AverageStatisticsDTO> getAverageDayNumPage(FilterPageByAverageVO filterPageByAverageVO) {
-        filterPageByAverageVOSet(filterPageByAverageVO);
+        filterFacade.filterPageByAverageVOSet(filterPageByAverageVO);
         IPage<AverageStatisticsDTO> page = homePageFacade.getAverageDayNumPage(filterPageByAverageVO);
         return page;
     }
@@ -493,7 +381,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<AverageStatisticsDTO> getAverageFeePage(FilterPageByAverageVO filterPageByAverageVO) {
-        filterPageByAverageVOSet(filterPageByAverageVO);
+        filterFacade.filterPageByAverageVOSet(filterPageByAverageVO);
         IPage<AverageStatisticsDTO> page = homePageFacade.getAverageFeePage(filterPageByAverageVO);
         return page;
     }
@@ -505,7 +393,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<AverageStatisticsDTO> getAverageScoreByDeptPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<AverageStatisticsDTO> page = qcresultInfoFacade.getAverageScoreByDeptPage(filterPageVO);
         return page;
     }
@@ -517,7 +405,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<NumDTO> resultStatisticsByDeptPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<NumDTO> page = behospitalInfoFacade.resultStatisticsByDeptPage(filterPageVO);
         return page;
     }
@@ -529,7 +417,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<QcResultPercentDTO> levelPercentGroupByDeptPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<QcResultPercentDTO> page = qcresultInfoFacade.levelPercentGroupByDeptPage(filterPageVO);
         return page;
     }
@@ -541,7 +429,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<EntryNumDTO> entryGroupByEntryInnerPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<EntryNumDTO> page = qcresultInfoFacade.entryGroupByEntryInnerPage(filterPageVO);
         return page;
     }
@@ -554,12 +442,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO) {
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
         return records;
     }
@@ -571,12 +454,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass2(filterOrderVO);
         return records;
     }
@@ -588,12 +466,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO) {
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
         if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
@@ -612,16 +485,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<HomePageNumDTO> homePageLevelLimit(FilterOrderVO filterOrderVO) {
-
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
-        if (filterOrderVO.getLimitCount() == null || filterOrderVO.getLimitCount().equals(0)) {
-            filterOrderVO.setLimitCount(10);
-        }
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
         HomePageNumDTO item = getGlobleRecord(records);
         if (item != null) {

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

@@ -1,8 +1,19 @@
 package com.diagbot.facade;
 
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.FilterOrderByDeptVO;
+import com.diagbot.vo.FilterOrderVO;
+import com.diagbot.vo.FilterPageByAverageVO;
+import com.diagbot.vo.FilterPageByDeptVO;
+import com.diagbot.vo.FilterPageVO;
+import com.diagbot.vo.FilterVO;
 import org.springframework.stereotype.Component;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -91,4 +102,142 @@ public class FilterFacade {
         //上一统计周期的截止时间等于本周期的起始时间
         return getStartDateStr(type, null);
     }
-}
+
+    /**
+     * 入参拼接
+     *
+     * @param filterVO
+     */
+    public void filterVOSet(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);
+        } else {
+            try {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = dateFormat.parse(filterVO.getEndDate());
+                long interval = date.getTime() + 1000;
+                filterVO.setEndDate(dateFormat.format(new Date(Long.valueOf(interval))));
+            } catch (ParseException e) {
+
+            }
+        }
+    }
+
+    /**
+     * 分页入参拼接
+     *
+     * @param filterPageVO
+     */
+    public void filterPageVOSet(FilterPageVO filterPageVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterPageVO.setHospitalId(hospitalId);
+        filterPageVO.setUserId(Long.valueOf(userId));
+        String startDate = "";
+        String endDate = "";
+        if (StringUtil.isBlank(filterPageVO.getStartDate())) {
+            startDate = getStartDateStr(filterPageVO.getType(), null);
+            filterPageVO.setStartDate(startDate);
+        }
+        if (StringUtil.isBlank(filterPageVO.getEndDate())) {
+            endDate = getEndDateStr(filterPageVO.getType(), null);
+            filterPageVO.setEndDate(endDate);
+        } else {
+            try {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = dateFormat.parse(filterPageVO.getEndDate());
+                long interval = date.getTime() + 1000;
+                filterPageVO.setEndDate(dateFormat.format(new Date(Long.valueOf(interval))));
+            } catch (ParseException e) {
+
+            }
+        }
+    }
+
+
+    /**
+     * 过滤条件设置
+     *
+     * @param filterPageByDeptVO
+     */
+    public void filterPageByDeptVOSet(FilterPageByDeptVO filterPageByDeptVO) {
+        FilterPageVO filterPageVO = new FilterPageVO();
+        BeanUtil.copyProperties(filterPageByDeptVO, filterPageVO);
+        filterPageVOSet(filterPageVO);
+        filterPageByDeptVO.setHospitalId(filterPageVO.getHospitalId());
+        filterPageByDeptVO.setUserId(filterPageVO.getUserId());
+        filterPageByDeptVO.setStartDate(filterPageVO.getStartDate());
+        filterPageByDeptVO.setEndDate(filterPageVO.getEndDate());
+    }
+
+    /**
+     * 过滤条件设置
+     *
+     * @param filterOrderVO
+     */
+    public void filterOrderVOSet(FilterOrderVO filterOrderVO) {
+        FilterVO filterVO = new FilterVO();
+        BeanUtil.copyProperties(filterOrderVO, filterVO);
+        filterVOSet(filterVO);
+        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) {
+        FilterVO filterVO = new FilterVO();
+        BeanUtil.copyProperties(filterOrderByDeptVO, filterVO);
+        filterVOSet(filterVO);
+        filterOrderByDeptVO.setHospitalId(filterVO.getHospitalId());
+        filterOrderByDeptVO.setUserId(filterVO.getUserId());
+        filterOrderByDeptVO.setStartDate(filterVO.getStartDate());
+        filterOrderByDeptVO.setEndDate(filterVO.getEndDate());
+        filterOrderByDeptVO.setLimitCount(filterVO.getLimitCount());
+    }
+
+    /**
+     * 平均住院天数、平均花费入参设置
+     *
+     * @param filterPageByAverageVO
+     */
+    public void filterPageByAverageVOSet(FilterPageByAverageVO filterPageByAverageVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        Date date = new Date();
+        String year = DateUtil.getYear(date);
+        String startDate = getStartDateStr(filterPageByAverageVO.getType(), null);
+        String endDate = getEndDateStr(filterPageByAverageVO.getType(), null);
+        String lastStartDate = getLastStartDateStr(filterPageByAverageVO.getType());
+        String lastEndDate = getLastEndDateStr(filterPageByAverageVO.getType());
+        String lastYearStartDate = getStartDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
+        String lastYearEndDate = getEndDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
+        filterPageByAverageVO.setHospitalId(hospitalId);
+        filterPageByAverageVO.setUserId(Long.valueOf(userId));
+        filterPageByAverageVO.setStartDate(startDate);
+        filterPageByAverageVO.setEndDate(endDate);
+        filterPageByAverageVO.setLastStartDate(lastStartDate);
+        filterPageByAverageVO.setLastEndDate(lastEndDate);
+        filterPageByAverageVO.setLastYearStartDate(lastYearStartDate);
+        filterPageByAverageVO.setLastYearEndDate(lastYearEndDate);
+    }
+}

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

@@ -20,19 +20,13 @@ public class FilterPageVO extends Page {
      */
     @NotNull(message = "请输入本年或本月")
     private Integer type;
-    /**
-     * 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
-     */
-    private Integer dateType;
     /**
      * 起始时间
      */
-    @ApiModelProperty(hidden = true)
     private String startDate;
     /**
      * 结束时间
      */
-    @ApiModelProperty(hidden = true)
     private String endDate;
     /**
      * 医院id

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

@@ -22,12 +22,10 @@ public class FilterVO {
     /**
      * 起始时间
      */
-    @ApiModelProperty(hidden = true)
     private String startDate;
     /**
      * 结束时间
      */
-    @ApiModelProperty(hidden = true)
     private String endDate;
     /**
      * 医院id

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -31,6 +31,7 @@
         <result column="director_doctor_id" property="directorDoctorId"/>
         <result column="director_doctor_name" property="directorDoctorName"/>
         <result column="is_placefile" property="isPlacefile"/>
+        <result column="placefile_date" property="placefileDate"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>