diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java index abf7c3d..87f5181 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java @@ -231,7 +231,7 @@ public class NczxyyLisService { - public List queryLisCheckList(String cardNo){ + public static List queryLisCheckList(String cardNo){ SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd "); List result = new ArrayList<>(); Calendar c = Calendar.getInstance(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java index bdd82a2..faa031f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java @@ -67,7 +67,11 @@ public interface IReportService extends IBaseService { void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp); - BaseObjectResponse couponInfo(Map param); + BaseObjectResponse coupon(Map param); BaseObjectResponse couponInit(Map userId); + + BaseObjectResponse couponInfo(Map param); + + void exportCouponInfo(Map param, HttpServletResponse response); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java new file mode 100644 index 0000000..6e53d0d --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java @@ -0,0 +1,39 @@ +package com.lyms.platform.operate.web.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + + +/** + * 添加类的一句话简单描述。 + *

+ * 详细描述 + *

+ * 示例代码 + *

+ * 
+ * + * @author JIAZHI.JIANG + * @version BME V100R001 2017-06-06 16:22 + * @since BME V100R001C40B104 + */ +public class PageUtil { + + //日志调测器 + private static final Logger logger = LoggerFactory.getLogger(PageUtil.class); + public static void setPageInfo(Map map) { + Integer pageSize = map.get("pageSize") == null ? 15 : Integer.parseInt(map.get("pageSize").toString()); + Integer currentPage = map.get("currentPage") == null ? 1 : Integer.parseInt(map.get("currentPage").toString()); + if(pageSize < 1) { + pageSize = 10; + } + if(currentPage < 1) { + currentPage = 1; + } + map.put("currentPage", (currentPage - 1) * pageSize); + map.put("pageSize",pageSize); + } + +}