|
@@ -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) {
|