|
@@ -1,5 +1,6 @@
|
|
|
package com.diagbot.facade;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.diagbot.dto.HospItemDTO;
|
|
|
import com.diagbot.dto.HospNameDTO;
|
|
|
import com.diagbot.dto.OptDTO;
|
|
@@ -13,6 +14,7 @@ import com.diagbot.util.HttpUtils;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.HospitalVO;
|
|
|
+import com.diagbot.vo.OptHospPageVO;
|
|
|
import com.diagbot.vo.OptHospVO;
|
|
|
import com.diagbot.vo.OptVO;
|
|
|
import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
|
|
@@ -169,6 +171,23 @@ public class OptInfoFacade extends OptInfoServiceImpl {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ public IPage<HospItemDTO> getOptSumHospNoDaysPageFac(OptHospPageVO optHospPageVO) {
|
|
|
+ //入参验证
|
|
|
+ if (null != optHospPageVO && null != optHospPageVO.getStartDate()) {
|
|
|
+ optHospPageVO.setStartDate(DateUtil.getFirstTimeOfDay(optHospPageVO.getStartDate()));
|
|
|
+ }
|
|
|
+ if (null != optHospPageVO && null != optHospPageVO.getEndDate()) {
|
|
|
+ optHospPageVO.setEndDate(DateUtil.getLastTimeOfDay(optHospPageVO.getEndDate()));
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null != optHospPageVO && null != optHospPageVO.getStartDate() && null != optHospPageVO.getEndDate()) {
|
|
|
+ if (DateUtil.after(optHospPageVO.getStartDate(), optHospPageVO.getEndDate())) {
|
|
|
+ throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "开始时间大于结束时间!");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return getPageHospitalPUZ(optHospPageVO);
|
|
|
+ }
|
|
|
+
|
|
|
public HospNameDTO getAllHospitalName(){
|
|
|
HospNameDTO hospNameDTO = new HospNameDTO();
|
|
|
List<String> hospitalList = optInfoFacade.getAllHospital();
|