Merge remote-tracking branch 'origin/master'

commons-ehr-constants/src/main/java/com/yihu/ehr/constants/ServiceApi.java

@@ -1353,6 +1353,11 @@ public class ServiceApi {
        public static final String GetYearDropdownList = "/tj/getYearDropdownList";
        public static final String GetOftenIllList = "/tj/getOftenIllList";
        public static final String GetHighCostList = "/tj/getHighCostList";
        public static final String GetRepeateInspectList = "/tj/getRepeateInspectList";
        public static final String DrugAnalysis = "/tj/drugAnalysis";
        public static class Scheduler {
            public static final String ExtractMedicineExpense = "/tj/scheduler/extractMedicineExpense";
            public static final String ExtractChronicDisease = "/tj/scheduler/extractChronicDisease";

commons-util/src/main/java/com/yihu/ehr/util/rest/Envelop.java

@@ -29,7 +29,7 @@ public class Envelop<T, J> implements Serializable{
    private int currPage = 1;
    private int totalPage;
    private int totalPage = 0;
    private int totalCount;
@@ -66,6 +66,10 @@ public class Envelop<T, J> implements Serializable{
    }
    public int getTotalPage() {
        if(pageSize == 0){
            pageSize = 15;
        }
        if (totalCount % pageSize > 0) {
            totalPage = totalCount / pageSize + 1;
        } else {